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

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

Change-Id: I70daa117908a5a26091ceff41f45efd58abd9d27