Merge "DO NOT MERGE Focus clock by default" into rvc-qpr-dev am: d77d372dc7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f3e2761489f5dd954d1e490f9d8b926e4f61e13