Merge "Make the BluetoothMap class @SystemApi" am: 7de3328d4e am: 0b9386c52d

Change-Id: I75eff4043effbd13f1facbbbead512f164721cb4