[automerger skipped] Merge "Implement Camera Id Remapping in CameraService"...

[automerger skipped] Merge "Implement Camera Id Remapping in CameraService" into udc-qpr-dev am: 48354046 am: 71c5cd1c -s ours

am skip reason: Merged-In Ie1d726c45032ee8e7b9773640f96465451167dc9 with SHA-1 73125c6c is already in history

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



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