Merge "Fix resource leak" am: 4bfb3cf4 am: 720086d8 am: 5fb2c257 am:...

Merge "Fix resource leak" am: 4bfb3cf4 am: 720086d8 am: 5fb2c257 am: b6e94a0d am: f9aa9d66

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



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