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

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

Change-Id: I8cf3b22436ef6e8e8d4123682de5a0f7e32ade86