Merge "Merge "Fixes for scrolling screenshot tests." into sc-dev am: 35d25d11 am: a2268a5f" into sc-v2-dev-plus-aosp am: 28781f7b

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

Change-Id: I1785112361ab15d7f527268a92bb0c1e0e3f8c97