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

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



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