[automerger skipped] Add scroll chip to screenshot shelf ui am: a67e1eef -s ours

am skip reason: Merged-In I09a62c7bab7defbcd94dbef54d7a2526180b8b8d with SHA-1 5f963962 is already in history

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



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