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

Merge "ultrahdr: Avoid possible failure during gainmap compression" into udc-dev am: 6cec8864 am: 5e3ea163 am: da6ee30c

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



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