Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev am: e949d0f870

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14063746

Change-Id: Ida57003f03a40fe813f299903b39502a5945f7d2