Merge "Workaround to fix remote animation hanging." into sc-dev am: ef483c66...

Merge "Workaround to fix remote animation hanging." into sc-dev am: ef483c66 am: 3c69fece am: 30f77523

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

Change-Id: Iaf6572855f0998e29d86d2abd81f3dfa69a9c4ea