Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6
-s ours am: 86e798c998
-s ours am: dc47a4b45f
-s ours"
This commit is contained in:
committed by
Android (Google) Code Review
commit
980459703f