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 am: 20dfd3c3 am: 0f155ff2 am: b5f2d00e

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



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