[automerger skipped] Merge "Update clock burn-in so it doesn't clash with udpfs" into sc-qpr1-dev am: d58d6bfd38 -s ours am: ceaa221c97 -s ours
am skip reason: Merged-In I6f95fe3ad763971b804129b517f4c98192ab3674 with SHA-1 9b62051f88 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853618
Change-Id: Id42870149a6278fdcc71b0b0ac4d2dbaf46d3dd3
This commit is contained in: