[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed
am: 345673cc89
am: 88473aabef
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000 Change-Id: I0c9dbf87bfcc616ffe4669912214500fa5cfeb7b
This commit is contained in: