Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60
am: 2318405bcb
am: 8ee78e05e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829 Change-Id: I871f2605f7e3760b8667811fa36d86863e2d5cc4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: