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

Merge "Update clock burn-in so it doesn't clash with udpfs" into sc-v2-dev am: 15686a37 am: 3e356d5e

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

Change-Id: I5c476b0ca0853e45a67415ef60d7ee260c8fda45