[automerger skipped] Merge "Remove usage of private @android:color for...

[automerger skipped] Merge "Remove usage of private @android:color for incoming_dialog" into tm-qpr-dev am: b24a304a -s ours am: 531daca0 -s ours

am skip reason: Merged-In I6b3b5ec8e7cce4c8998097bd7eaaf18f4bbd52ce with SHA-1 ab9629da is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21066582



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