[automerger skipped] Merge "Fix references to resources using incorrect packages in SystemUI-core" into main am: 35d5d62deb am: dea4c2613b -s ours am: 2a5c68fe86 -s ours am: d9379e4d55 -s ours am: 83c47731ef -s ours

am skip reason: Merged-In I8f825ef549a5e0bd67e10d260ecdc3353a526fdb with SHA-1 61f1478772 is already in history

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

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