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

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



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