[DO NOT MERGE] Improvements and fixes for BLE scanning within CDM

Test: manual
Bug: 168052577
Change-Id: I16ec39d1139ab6ab0c2c84364493268e8f395d43
(cherry picked from commit 10a1973972398360d0e2913e5c5348565c9f63c8)
2 files changed