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