[conflict] Merge "Fix crash prone code in BluetoothDeviceManager." into tm-qpr-dev am: 61030515

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/19501572



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