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

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



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