Merge "Block animation transfer after surface animation finishes." am: 4e54b2f3f9 am: 8057c823bf

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

Change-Id: I5af2fa814deca6d6e454fb75aa9c69e38988e854