Merge "ultrahdr: Renamed and disabled build targets" into main am: fe5ca00ca3 am: 69b3984983 am: 97498a5bff

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

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