Merge "Broadcast UUIDS on BT state transition to ON am: 6fb4b240 am:...
Merge "Broadcast UUIDS on BT state transition to ON am: 6fb4b240 am: ce3e0b67" into nyc-mr1-dev-plus-aosp
am: de31504e
* commit 'de31504e':
Change-Id: Id22613393816455835bad435b1ff083c00e37efd