Merge "Add CTS for BatteryStatsManager new API" am: 7325c86c26

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722770

Change-Id: I1eacae5622a680241b754100095f30d2ab972149