Merge "Merge "Add dialog test util to ViewScreenshotTestRule" into tm-qpr-dev...

Merge "Merge "Add dialog test util to ViewScreenshotTestRule" into tm-qpr-dev am: a891b177" into tm-qpr-dev-plus-aosp am: eab55378

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



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