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

[automerger skipped] Merge "Implement CameraIdRemapping for API1" into udc-qpr-dev am: ee345caa -s ours am: e2629f94 -s ours

am skip reason: Merged-In I82b92e2c94209475f0da0b48c2993ff3b0ac7f28 with SHA-1 edb38964 is already in history

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



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