[automerger skipped] Merge "Make bluetooth not discoverable via large screen...

[automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f am: 95dd3a91 am: d7d9010c -s ours am: 9a2c8f1a -s ours

am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 846d0286 is already in history

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



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