Merge "ultrahdr: Remove unused Android.bp of deprecated ultrahdr" into main