Merge "Camera: Stop waiting if device enters ERROR state" into udc-dev am: da90930623 am: b40c761d18

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

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