Merge "Skip BatteryStatsManagerTest on Q" am: e2067816e9 am: 4bcefe111a am: 354f5cf7d0

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

Change-Id: I2ddf45299974c4016388a80d37c11f4d4a939bc8