[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: f91da36d0a
-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: I0a4630d98fc9e270a52490ba5303e9e7d25c63d8
This commit is contained in: