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

Change-Id: I315fc5ad3a124b3d38b4104c8afb35557d440b84