Merge "Added Ble scan APIs to BatteryStatsManager" am: 54c9ff981e

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

Change-Id: I9fc31acd57e674d4fa8abfc2c038bf2cb744178d