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

am skip reason: Merged-In I547a2f035cfc7f9eaa9bdea37846a3ba4fbe1475 with SHA-1 833d535101 is already in history

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

Change-Id: I84af513ddfa4d720d0f0156faf3e226c38b0479d