Merge "Add explicit sizing logic for single words" into tm-dev am: 7316c959...

Merge "Add explicit sizing logic for single words" into tm-dev am: 7316c959 am: 490cfd0b am: 238391b6

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



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