[automerger skipped] Merge "Fix some OWNERS files for System UI" into...

[automerger skipped] Merge "Fix some OWNERS files for System UI" into tm-qpr-dev-plus-aosp am: 398956a4 -s ours

am skip reason: Merged-In Ieee94010b4439fa6db96576ff7696eef8abd0d0d with SHA-1 995ebcd5 is already in history

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



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