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

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

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