[automerger skipped] Merge "Added Ble scan APIs to BatteryStatsManager" into...

[automerger skipped] Merge "Added Ble scan APIs to BatteryStatsManager" into sc-dev-plus-aosp am: 1c32cef2 am: 862051d9 -s ours

am skip reason: Merged-In Ie6c6d3688d2da45956d57ea1dbc2cc4430f27783 with SHA-1 f771dac9 is already in history

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

Change-Id: I0dc4f13612ed70d57d7ec5d1795a88345495e9c5