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 am: 6367a80f am: 821d8c49

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



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