Merge "Fix screenshot work profile badge padding" into tm-qpr-dev am: 6a7f3c0c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20916490



Change-Id: I3af800a031e140833d4aa0a857c75bd953c40917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>