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

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

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



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