Merge "Wait for remote animation to stop freezing display" into rvc-dev am: 0207dba4 am: 276b14ee am: e9521903 am: 32f9f0de

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

Change-Id: I85063664243476fb60ed6bd1bca08fe53ecd55eb