Merge "Security: Fix heap use after free" into tm-qpr-dev am: 0c1d39b8

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



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