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

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

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



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