Merge "Update clock burn-in so it doesn't clash with udpfs" into sc-qpr1-dev am: d58d6bfd

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

Change-Id: I8a3fdd22a80e1f0b6777f99762baea2b74665c0b