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

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

Change-Id: I917c4c8e5fe8773e694a6e36aa6ec6b36fb85fd9