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

[automerger skipped] Merge "Added Ble scan APIs to BatteryStatsManager" am: 54c9ff98 am: 4c22f155 -s ours am: b48e9aa7 -s ours am: cd1863ea -s ours

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

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

Change-Id: I1af903aec3f02bc4b87d3413052c7b080b7ac831