Merge "Fix potential NPE when callback remote animator" am: 7fdf68db22

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

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