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: 276b14ee

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

Change-Id: I9c576279c35778ee2452ee30be4838b07a7d6966