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: 711868cf

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

Change-Id: I78b252250041f964cec1cb7d41a1d93c055eaf2f