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

Merge "Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c7477974 am: f782357b" into rvc-d1-dev-plus-aosp am: 8a2dfe16

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

Change-Id: Ib211b7f4461c347a2c7beb7d0c984bae47ec40f7