[automerger skipped] Merge "[DO NOT MERGE] Improvements and fixes for BLE...

[automerger skipped] Merge "[DO NOT MERGE] Improvements and fixes for BLE scanning within CDM" into sc-dev am: f650c528 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13474625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e95d566f5ac72f612e32cf9a68cf4a7cac6c994