Merge changes from topic "am-0ae48a37c3b346e898e031e9c7937468" into sc-v2-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: 9c5b980cbf -s ours am: 52b37ccbdc -s ours am: 9ea7a626ba -s ours am: 15f9ce95d1 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: f589c5825a -s ours am: 53060241be -s ours am: dca1c2ba08 -s ours am: 8ca55077fa -s ours
This commit is contained in:
Automerger Merge Worker
2021-11-09 07:46:16 +00:00
committed by Android (Google) Code Review

Diff Content Not Available