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

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



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