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