[automerger skipped] Merge "bt: Use group id to select color for icon" into udc-dev am: b98f79e5 am: 55d29e0e am: 02315862 -s ours am: 08693e56 -s ours

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

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



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