Merge changes from topic "am-0095f4478dec434bb6286b7944b22006" into sc-v2-dev-plus-aosp
* changes: [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am:d89fa348ed
am:d3647e4668
am:f878351899
-s ours [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am:d7c50f7952
am:4d356edd17
am:2ac75e8144
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
da6dcaab16