Merge "ultrahdr: Avoid possible failure during gainmap compression" into udc-dev am: 6cec886438 am: b4305ae405

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

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