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

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

Change-Id: I5b9ec0c81efa7c47ebb4d42cdb947c19faf43039