[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable...

[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad1 -s ours am: e26317b9 -s ours am: ce98ad58 -s ours am: cfcad71f -s ours am: b7ac6d6b -s ours am: d7a41f98 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ibaf569c956978f1672cc4ee39110788f45281bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>