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

Change-Id: Ifeab867ba61527588eadc83dd78ccf9be7461d01