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 am: 22d429e3" into tm-qpr-dev-plus-aosp am: c768f950

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



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