Merge "Fix permission check for access to the Bluetooth device address am:...
Merge "Fix permission check for access to the Bluetooth device address am: c8d55992 am: dffd4c1f" into oc-mr1-dev-plus-aosp
am: baf8d33f
Change-Id: Ic9655dc25fe1479d2b0b5fcc74ec7c1b5bb78740