[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours am: e26317b97c -s ours am: ce98ad58a5 -s ours am: cfcad71f14 -s ours am: 6f054391f9 -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: I796d2d821d98013721ea59446bc330f8dcda5cfe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: