Merge "Camera: Improve error handling of device state listeners" into udc-dev am: cbfa540d34 am: d4e635b3a9

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

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