Merge "Merge "Fix BLE scan leaks" into oc-dr1-dev am: 604a4b7171 am: b7e2c50214" into oc-mr1-dev-plus-aosp