Merge "Fix potential NPE when callback remote animator" am: 7fdf68db22 am: 80a173aca9 am: 97353972b7

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

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