Merge "Fix NPE when finishing remote animation" am: a58ffe3791 am: 665d379b9c am: f7c5787ab3

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

Change-Id: I93c25024cd27103ff6d7908d44d36cd55080da26
Signed-off-by: Automerger Merge Worker <[email protected]>