Merge "[conflict] Merge "GD Scan: Update btm_cb.ble_ctr_cb when scan" into tm-dev am: 3003b6e3" into tm-dev-plus-aosp am: 4b86e738

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



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