Merge "Check for expired mergeTarget in mergeAnimation" into udc-qpr-dev am: e0b84069

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



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