Merge "Always showContentVisibility(true) after switch/expand animations."...

Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c7477974 am: b0682c45 am: e5062ff2 am: fcf885f2

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

Change-Id: Ica68b7aa3e0420a482b9bbf07ec239c036befbb7