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

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



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