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

Change-Id: I67b0e0f52f1910f74362ff4826d803a320a3f7f8