[automerger skipped] Merge "Fix AAOS SystemUI Presubmit tests that are...

[automerger skipped] Merge "Fix AAOS SystemUI Presubmit tests that are breaking." into rvc-qpr-dev am: 339c9812 am: c2888a30 -s ours

am skip reason: Change-Id Ife2ac4e746006c39eaf46cd0328c1639149891b2 with SHA-1 544a824b is in history

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

Change-Id: I401b46ff9696e843aeeefc6fd123601fd8764004