Merge "Fix references to resources using incorrect packages in SystemUI-core" into main am: 35d5d62deb

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

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