Merge "Revert "Revert "Add CUJ tracking in animation listener.""" into udc-dev...

Merge "Revert "Revert "Add CUJ tracking in animation listener.""" into udc-dev am: 5490ac6e am: 5a6dc893 am: 2cf2448f am: 64ffbe9b

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



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