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

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



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