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

Change-Id: Ie5a17a94f9221097339eb37c327607a9417c8373