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

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



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