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: I8bbd46652b89fc0d3be40305dc2e4c1debdee2fa