Merge "Crash occurs when entering a Bluetooth broadcast password" into main...

Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc14340 am: 6d9e295c am: 4f9381ef

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



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