Merge "Update BT device properly in BluetoothDeviceManager when device with same address changed to other type." am: b9b748ccc8 am: 8759d8a9e0 am: f8b9878cf4

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

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