Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d2

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



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