[automerger skipped] Merge "Use ERROR_CAMERA_DISCONNECTED on id remap" into...

[automerger skipped] Merge "Use ERROR_CAMERA_DISCONNECTED on id remap" into udc-qpr-dev am: b89d4e55 -s ours am: 8edddb9e -s ours

am skip reason: Merged-In I54a19ca71f7126bc46d9f2a3086d75af2e5d87ea with SHA-1 f4c80f2f is already in history

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



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