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: 61f381d0 am: bcdf316e

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

Change-Id: Ie234bf775197ea94a79d4d9c07994449ac752538