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

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

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



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