[automerger skipped] Merge "Replace DateView with VariableDateView (1/2)" into sc-qpr1-dev am: c8f21f3bb0 -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: I5f3bb8398000ab8dd6493d23594cb5b9ab5eb07d