[automerger skipped] Merge "ultrahdr: Updates to unit tests" into main am: 88f1c1119e am: d55384bed8 am: faabf9ae8a -s ours

am skip reason: Merged-In I917e9385f2a4b92add8667248a88789b5332da76 with SHA-1 0202c12515 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2854563

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