Merge "Fix NPE when finishing remote animation" am: a58ffe37 am: 665d379b

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



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