[automerger skipped] Merge "Harden remapCameraApi() API" into udc-qpr-dev am:...

[automerger skipped] Merge "Harden remapCameraApi() API" into udc-qpr-dev am: 77d31f5c am: ac24daab -s ours

am skip reason: Merged-In I176959e56563bc587c4fca594cfc242941b503d6 with SHA-1 0894f5b1 is already in history

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



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