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

Merge "[automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f am: 10c3e3e5 am: 2da3d922 -s ours" into tm-qpr-dev-plus-aosp am: 073aae82 -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: I881263bb60dbe6fb9c2a6587f1a8942ce1f4c1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>