[automerger skipped] Merge "Replace DateView with VariableDateView (1/2)" into...

[automerger skipped] Merge "Replace DateView with VariableDateView (1/2)" into sc-v2-dev am: c68117c2 am: 95cadb24 -s ours

am skip reason: Merged-In I547a2f035cfc7f9eaa9bdea37846a3ba4fbe1475 with SHA-1 4eb44d19 is already in history

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

Change-Id: Id7c2043b04ffe457835e3266625589613e6188d3