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 am: c5417bfb

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

Change-Id: I69efe97af04cec63a4a7be9ca1eaeafdf89d1dd9