Merge "Add ClockId to AOD CUJs" into udc-qpr-dev am: 23b05cd28b

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

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