Merge "Enforce privileged permissions for SystemApis in HidHostService and BluetoothMapService"