Merge "Update clock complication text protection." into tm-qpr-dev am: f3b18885

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



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