Merge "Fix references to resources using incorrect packages in SystemUI-core"...

Merge "Fix references to resources using incorrect packages in SystemUI-core" into udc-dev-plus-aosp am: 65667c84

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



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