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

Merge "Fix UAF in ~CallbackEnv" into tm-dev am: d42f6181 am: 53a6e449 am: 4c767751 am: 5ef68ecc am: c003d797

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



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