Merge "Fix visibility of VariableDateView" into sc-qpr1-dev am: 25ef63e748 am: 29745061fa am: 2904ba3b30

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

Change-Id: I5f09e761c7205ae356e977ee6bc7e739728e947a