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

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



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