[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 skip reason: subject contains skip directive

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



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