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

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

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