Merge "Fix a stale animator reference being used on bounds change" into...

Merge "Fix a stale animator reference being used on bounds change" into udc-dev am: 573d9a4e am: d52b9248

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



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