[automerger skipped] Merge "Update clock burn-in so it doesn't clash with...

[automerger skipped] Merge "Update clock burn-in so it doesn't clash with udpfs" into sc-qpr1-dev am: d58d6bfd am: 6957435e -s ours

am skip reason: Merged-In I6f95fe3ad763971b804129b517f4c98192ab3674 with SHA-1 9b62051f is already in history

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

Change-Id: I18a92065ab2a12de11b547bf6e61a1a1f08130ea