Merge "Camera: Improve error handling of device state listeners" into udc-dev am: cbfa540d am: 9d884ccb am: e754ac79 am: 3b1d7700

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



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