[automerger skipped] Merge "DO NOT MERGE Focus clock by default" into...

[automerger skipped] Merge "DO NOT MERGE Focus clock by default" into rvc-qpr-dev am: d77d372d am: 3cbb7799 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37067cbba5101afe0c057ab20606c7a99c97d45a