[automerger skipped] Merge "Replace DateView with VariableDateView (1/2)" into sc-qpr1-dev am: c8f21f3bb0 -s ours am: 5f793c2798 -s ours

am skip reason: Merged-In I547a2f035cfc7f9eaa9bdea37846a3ba4fbe1475 with SHA-1 0558e12116 is already in history

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

Change-Id: I4a23893bf529899d1e1897ce0c733a3131be8980