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: fb285f6f am: 4b2d5051

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



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