Merge "[conflict] Merge "Fix crash prone code in BluetoothDeviceManager." into...

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

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



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