tree f8c61bc2343b5aa08517f9bcd7481d51891b302b
parent 55295fa0e5c696853c79766fe21f53d4b94eb613
parent dee7e162655c100d1d785d2381db132701ccb2f3
author Hugh Chen <hughchen@google.com> 1636448624 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636448624 +0000

[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: 56b95bd8c0 -s ours am: 09258363f5 -s ours am: 7a5b3bcd86 -s ours am: dee7e16265 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iaf3d9361c221136191d3dc0fa576c114fe85d631