Merge "Updated the Bluetooth Settings owners list" am: 5a56c31913
am: b1230be1b8

Change-Id: Idc872dced34147a2a55a8734f22e9d6131bf9142