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

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



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