Merge "Set original address as identity address" am: 1f8a0344 am: 414eb3fe...

Merge "Set original address as identity address" am: 1f8a0344 am: 414eb3fe am: c82bd9e8 am: 0ea82d9a am: beb341bf

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



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