Merge "Fix visibility of VariableDateView" into sc-qpr1-dev am: 25ef63e748

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

Change-Id: If41d208a1d5c27de561db037b04e3f84ec8615ef