Merge "Merge "Revert "Fixes a bug in the BluetoothDevice#getIdentityAddress API where it"" into tm-dev am: c198cec2 am: 757f0a53" into tm-d1-dev-plus-aosp am: 508eeacf am: 3b06d4d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/19281218



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