[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
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16144999 Change-Id: I877437ac1c6a24678f59cfe4253ebba6852433c6
This commit is contained in: