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

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



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