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

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

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