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: 1641bbda am: 0d7daab3

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



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