[automerger skipped] Use ERROR_CAMERA_DISCONNECTED on id remap am: c2d11e138e -s ours am: 84c2f27c37 -s ours

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

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

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