Merge "Fix clock too low in preview" into udc-dev am: 70c75c04 am: 2cae69d2

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



Change-Id: I30c15548b27558192e84be78941282d6a935b899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>