Merge "Fix visibility of VariableDateView" into sc-qpr1-dev am: 25ef63e748 am: 8003854da2 am: 428cbbf112

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

Change-Id: I03fee7cb30a63e824b99c982b8ac100bd99b180b