Merge "Remove placeholder code for scrolling screenshots" into rvc-dev am:...

Merge "Remove placeholder code for scrolling screenshots" into rvc-dev am: fd809396 am: 1d289202 am: bb267815 am: fe605a6c

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

Change-Id: Ic21d07596c49eeecf9b7808458779f057725fbfe