Merge changes from topic "mar24b" into sc-dev

* changes:
  Preserve implicit split-permissions on clear.
  Replace BLUETOOTH and BLUETOOTH_ADMIN permission checks in BluetoothManagerService.