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

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



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