Merge "ultrahdr: Renamed and disabled build targets" into main am: fe5ca00ca3 am: 31a0fea110

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

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