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

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



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