[automerger skipped] Merge "Fix references to resources using incorrect...

[automerger skipped] Merge "Fix references to resources using incorrect packages in SystemUI-core" into udc-dev-plus-aosp am: 65667c84 am: dd2784bb -s ours am: b8173074 -s ours

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

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



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