Merge "Make the date baseline aligned with the clock baseline" into tm-qpr-dev am: 1a83f7a642

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

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