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

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



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