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: eb085ce0

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



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