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

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

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