Merge "Fix UAF in ~CallbackEnv" into tm-dev am: d42f6181 am: ac0f825c am:...

Merge "Fix UAF in ~CallbackEnv" into tm-dev am: d42f6181 am: ac0f825c am: 1c406b4b am: caf66424

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



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