Merge "JPEG/R refactor: rename "recovery map" to "gain map"" into udc-dev am: 129cb60743

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

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