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

Change-Id: If5c6dc5a342ccc440d4be15dca91045ebae26126