Merge "Skip BatteryStatsManagerTest on Q" am: e2067816e9

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

Change-Id: Iac778fc5dfe0b5ec0adf400372b3e43c5cc76d5d