Merge "Properly clean up security device record" am: 1a868267 am: f48848b8 am: ea16689d

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



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