[automerger skipped] Merge "Enable SystemUIGoogleScreenshotTests on main and...

[automerger skipped] Merge "Enable SystemUIGoogleScreenshotTests on main and disable on udc-qpr-dev" into udc-qpr-dev am: 1ce3e900 am: ecafac6a -s ours

am skip reason: Merged-In I86236180877f14273f2b59fc3d4b37529ed87c49 with SHA-1 5267a047 is already in history

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



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