Merge "Resolve BluetoothDevice hidden API usages by Settings"
am: ce656f7754

Change-Id: I6c9af91fa6338246a872318038dad699c5c3fe04