Merge "[DO NOT MERGE] Refactor ViewScreenshotTestRule slightly to make it a...

Merge "[DO NOT MERGE] Refactor ViewScreenshotTestRule slightly to make it a bit extensible" into tm-qpr-dev am: 87d38eb2

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



Change-Id: I2dd76c2e7c4cca95653b2f36797a2310719efb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>