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: e9e86c5c am: a9de72f6 am: 2c4881f6

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



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