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

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

Change-Id: Ib9b0f4ae0b94163727c4c52b7f9ba852db43ffd6