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

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

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