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

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

Change-Id: I6dbf73fff1409640bd2c9390cffbdc00292496b8