Merge "Wait for remote animation to stop freezing display" into rvc-dev am:...

Merge "Wait for remote animation to stop freezing display" into rvc-dev am: 0207dba4 am: a0ba1c6f am: e0b7712c am: f38d02f1

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

Change-Id: I81a81a44a0926ca403996a55a9db2b1c4590d179