Merge "Add profile badges to screenshot UI" into tm-qpr-dev am: ff851051

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



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