Merge "Prevent resize animation from changing the requested visibilities" into sc-v2-dev am: 2aba350b3f

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

Change-Id: Ie4ebc27b9cfbaa9b9c887b09ec6be1b62ff9e791