Merge "ultrahdr: Updates to unit tests" into main am: 88f1c1119e am: dbca8bd049

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

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