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: I78e897de5a2198f21de61422b88adbc4cf7aa34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>