Merge "Camera: Improve error handling of device state listeners" into udc-dev am: cbfa540d am: f12cd9ec am: 7a014f31

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



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