Merge "JPEG/R refactor: rename jpegrecoverymap library to ultrahdr" into udc-dev am: 2701676e am: 31c9ccf9

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



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