[conflict] Merge "GD Scan: Update btm_cb.ble_ctr_cb when scan" into tm-dev am:...

[conflict] Merge "GD Scan: Update btm_cb.ble_ctr_cb when scan" into tm-dev am: 3003b6e3 am: 40fcf61a am: 22d429e3

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



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