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

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



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