[automerger skipped] Screenshot shelf (xml version) am: 6b2d650d06 -s ours

am skip reason: Merged-In I45ede2ebcdcff7e3229028494c319f5aa9189f2e with SHA-1 8d0c72b371 is already in history

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

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