[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: 10c3e3e5 am: 2da3d922 -s ours am: cef8cb55 -s ours

am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 5df14831 is already in history

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



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