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

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



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