Merge "Use same height for start and end of date view" into tm-qpr-dev am: 967641b3

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



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