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

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

Change-Id: I69393cee760a4793319efdc53fdd2e071f9dbb4d