Merge "ultrahdr: Add unit tests for encoder APIs" into udc-dev am: 119daca2...

Merge "ultrahdr: Add unit tests for encoder APIs" into udc-dev am: 119daca2 am: 5f512005 am: 6c5c6cae

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



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