Merge "Fix AAOS SystemUI Presubmit tests that are breaking." into rvc-qpr-dev