Merge "Fixed battery percentage textView not resizing to fit estimate" into...

Merge "Fixed battery percentage textView not resizing to fit estimate" into udc-dev am: 31802ef7 am: 9753bad5 am: 760a0fc3 am: a584eacb

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



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