[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: 2f349df564
-s ours am: 545e867868
-s ours am: fdb2e9f16d
-s ours am: 3476b18630
-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: I49dbfac7d9ba438332dccf6f210112ca414e0ac1
This commit is contained in: