Merge "Make bluetooth not discoverable via large screen deep link flow" into...

Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f am: 10c3e3e5

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



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