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

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

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

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



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