tree f098f6fea9fbf4b4810db1741235f7779e7b8a62
parent 152b25d7da97b08d4936efb72c98bfb5ab78c76e
parent d3647e4668f9e19cfa443fb66b43e254256ce9b3
author TreeHugger Robot <treehugger-gerrit@google.com> 1636443491 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636443491 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: d3647e4668 -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: I0d62bae2313edecb9cb9d272af4e06f78b0406a9