Merge "Revert "Revert "Add CUJ tracking in animation listener.""" into udc-dev am: 5490ac6e am: ef927c3d am: eb26b6d6 am: 74063fad

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



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