Merge "Add a flag to guard removing the address mapping on device removal"...

Merge "Add a flag to guard removing the address mapping on device removal" into main am: c8df9a6a am: fbf9c0b3

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



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