Merge "Fixed battery percentage textView not resizing to fit estimate" into udc-dev am: 31802ef7 am: 6a8d0d77

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23730460



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