Merge "BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission" am: 88fba38a1c am: 940853b36f

Change-Id: If38d061113e23af9f7edc4609130bd13b3466686