Merge "Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592e1 am: c7336cdf18" into rvc-d1-dev-plus-aosp am: a431b3d6a0

Change-Id: If0151eb820f1eee4b6c2efa91bf99f6546fa9112