Merge "Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed am: 0531bd48e3" into oc-mr1-dev-plus-aosp
am: 465871284e
Change-Id: I45942af6b255c5d737058358493783eec48cf48e
This commit is contained in: