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

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



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