Merge changes from topic "am-e53a8b6326094f7281b3a5f892e28140" into sc-v2-dev-plus-aosp
* changes: [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am:b63f20f7dc
am:aaa1683558
-s ours [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am:b1adf980a5
am:4640a2a077
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
64394a2f3a