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

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



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