Merge "BTM: Properly merge LE scan from BTIF and CSIS" am: 36e4fb4c am:...

Merge "BTM: Properly merge LE scan from BTIF and CSIS" am: 36e4fb4c am: 8e103326 am: d8a7f404 am: 1f1d62cf

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



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