[automerger skipped] Merge "[DO NOT MERGE] Refactor ViewScreenshotTestRule...

[automerger skipped] Merge "[DO NOT MERGE] Refactor ViewScreenshotTestRule slightly to make it a bit extensible" into tm-qpr-dev am: 87d38eb2 am: de747ec0 -s ours am: df0ef4dc -s ours am: 56cca32b -s ours

am skip reason: subject contains skip directive

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



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