Merge "AudioService: fix uid check in setBluetoothScoOn" am: b0ae3e5bfc am: d9091b965c
am: c6aff30a41

Change-Id: Ie65f8df82f9cc6e5be112cd79c0ce573e4a5c838