[automerger skipped] Merge "Fix NPE when finishing remote animation" into...

[automerger skipped] Merge "Fix NPE when finishing remote animation" into tm-qpr-dev am: 4355d317 -s ours am: ca0e562e -s ours

am skip reason: Merged-In Ia244b5ba2d3ba891319b32513841f397177cde0f with SHA-1 3e66fda5 is already in history

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



Change-Id: Id9ce0e8d5906af58e79bd89ea9f815412c0cffee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>