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

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

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

Change-Id: I73cbf4ef9d3128f6980bdad7d78caddcb4a7bd1a