Merge "Enable SystemUIGoogleScreenshotTests on udc-qpr-dev" into udc-qpr-dev am: a4ddb0e5

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



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