tree d090a52eefdd8039430d5973f1672f033144e658
parent 156f041f7cbca5c504e48bc6940b69050d9fc581
parent 835a9f0718516fddb84ee325ec948622a4a6e319
author Hugh Chen <hughchen@google.com> 1636448083 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636448083 +0000

[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: Id88b11715e1625ae8c38e7eac92c056eac141c08