Merge "Bluetooth: show multi-device status in Quick Settings" into oc-dr1-dev
am: 3afa031888

Change-Id: I7a8f6a7fcb3a693cfdec47525f5d1384b34e7b66