Merge changes from topic...

Merge changes from topic "bluetooth_local_getidentity_instead_of_re-entrant_call" into main am: b6095917

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



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