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

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

Change-Id: Ifc69d4b19bf18f28c4e42c246d9ed9fdd58ee4ea