Add a flag to guard removing the address mapping on device removal am: 30a80b24 am: 8ec7e201

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



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