Merge "Fix NPE when finishing remote animation" am: a58ffe3791

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

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