Merge "ultrahdr: Avoid possible failure during gainmap compression" into...

Merge "ultrahdr: Avoid possible failure during gainmap compression" into udc-dev am: 6cec8864 am: b4305ae4 am: 2af67b1e am: d8eec2b0

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



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