Merge "Fix legacy failed unit test for BatteryInfoLoader" into sc-dev am: 10559fb9de

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

Change-Id: I8e2f5c3d7bf38378447371de1e958e50d970f194