[automerger skipped] Fix AppBatteryPreferenceTest flaky am: 6a6a263177
-s ours am: 362df0c72b
-s ours
am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d1278
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3077806
Change-Id: I03f98e2cd44550bdcd303de8bca8efccfab648bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: