[automerger skipped] Fix NPE when finishing remote animation am: 7f442446 -s...

[automerger skipped] Fix NPE when finishing remote animation am: 7f442446 -s ours am: 7c99c0c0 -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: I758b9a002f44dffb6761042f1793f16827d3d8f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>