Merge "Update battery settings remaining time format" into udc-dev am: e99f757f

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



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