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

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

Change-Id: I4168b127b63517c80aebbf270ecd0ec0b2f122cb