Merge "[conflict] Merge "GD Scan: Update btm_cb.ble_ctr_cb when scan" into...

Merge "[conflict] Merge "GD Scan: Update btm_cb.ble_ctr_cb when scan" into tm-dev am: 3003b6e3 am: 40fcf61a" into tm-d1-dev-plus-aosp am: 65612e58 am: 3f39b4af

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



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