[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6
-s ours am: 86e798c998
-s ours am: 001ff34dec
-s ours am: e1ebf1716b
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145001 Change-Id: I165d78bdc3f98a79c72e4a8a85e96bfcd13391a6
This commit is contained in: