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 am: ec1ac991

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



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