[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685
-s ours am: 0e8d3e3c35
-s ours am: 7134e1ac35
-s ours am: 62e555932c
-s ours am: 9c1eb61f8e
-s ours am: f87658eb94
-s ours am: b950aece42
-s ours am: 90d8736e66
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004 Change-Id: I606cebf91fd8216e92702f39d3c5b1c5c02cad59
This commit is contained in: