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

Merge "Remove placeholder code for scrolling screenshots" into rvc-dev am: fd809396 am: 24cd752a am: f78c2ef3

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

Change-Id: I88872b03b260cf7f534caffcd8a6c28077b3cef7