Merge "Merge "Revert "Revert "Add CUJ tracking in animation listener.""" into...

Merge "Merge "Revert "Revert "Add CUJ tracking in animation listener.""" into udc-dev am: 5490ac6e am: 5a6dc893" into udc-d1-dev-plus-aosp am: 6736cdf3

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



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