Merge "Enable Hyphens.Auto for SPA" into udc-dev am: 97d648ce am: 4453e4ec

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



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