[automerger skipped] Merge "Fix some OWNERS files for System UI" into tm-qpr-dev am: 6cd920ce5f am: e234d7a40f -s ours

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

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

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