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

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

Change-Id: I0d37233be2a4de551a74566e15e3ad6a528c47bc