[automerger skipped] Merge "bt: Use group id to select color for icon" into...

[automerger skipped] Merge "bt: Use group id to select color for icon" into udc-dev am: b98f79e5 -s ours am: 85d7ff18 -s ours am: fb9e1e71 -s ours

am skip reason: Merged-In If72187d050e8ea531b8f2c39e22f3faf1ec14f7b with SHA-1 a674a085 is already in history

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



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