[automerger skipped] Merge "Prevent resize animation from changing the...

[automerger skipped] Merge "Prevent resize animation from changing the requested visibilities" into sc-v2-dev am: 2aba350b am: 44a025aa -s ours

am skip reason: Merged-In I5d9213d7b3e32eccbf3a51335654f5f53899e6ae with SHA-1 cb11735c is already in history

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

Change-Id: I43c1feeb44f756f7cc88d0e40767d79af98d302a