[automerger skipped] Merge "Fix batteryInfo unit test" into tm-qpr-dev am:...

[automerger skipped] Merge "Fix batteryInfo unit test" into tm-qpr-dev am: 47fa8933 am: 89ad53e3 -s ours

am skip reason: Merged-In I8f94f984dc1bf833653ae49557fdd02f736b365c with SHA-1 54615b3b is already in history

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



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