[automerger skipped] Merge "Implement CameraIdRemapping for API1" into...

[automerger skipped] Merge "Implement CameraIdRemapping for API1" into udc-qpr-dev-plus-aosp am: f3779cdf -s ours

am skip reason: Merged-In I1e166e59e9441d8c7fe030320127abcfb373e428 with SHA-1 65d20692 is already in history

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



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