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

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



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