Merge "Revert "Fixes a bug in the BluetoothDevice#getIdentityAddress API where it"" into tm-dev am: c198cec2 am: 757f0a53 am: b7abfdcf am: 19a96819

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



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