Merge "Lock before try/catch and unlock in finalize" am: 6acb7d19 am: 4eb91428

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



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