Merge "Flag to retain identity address on BT restart" into main am: 7f3e5612 am: 91543e59

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



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