Merge "Show Bluetooth dialog in a specific case" am: e1e657da am: 420a8474 am: c6cbe0b6

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



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