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

Merge "ultrahdr: Avoid possible failure during gainmap compression" into udc-dev am: 6cec8864 am: 34e7a0a1

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



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