Merge "End screenshot animation early on layout change" into sc-dev am:...

Merge "End screenshot animation early on layout change" into sc-dev am: 719cd831 am: 2a35f22b am: 5a9c7031

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

Change-Id: I56d5496b75642c1f0f2070afde22607a6ea15a87