Merge "Block animation transfer after surface animation finishes." am:...

Merge "Block animation transfer after surface animation finishes." am: 4e54b2f3 am: 8057c823 am: b91693b1 am: d22c7cf1

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

Change-Id: Iac818422ff8dd601784698941e9104d1e5b03c43