[automerger skipped] Fix broken battery usage Robolectric tests am: 88d87631...

[automerger skipped] Fix broken battery usage Robolectric tests am: 88d87631 am: 35131aad -s ours

am skip reason: Merged-In I4f09f9e5af57a62249970cc2170b60dab267488e with SHA-1 1c457ce1 is already in history

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



Change-Id: I966bac48bb584bf8217083a6d6a333a37dc4c125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>