Merge "camera: Fix exception handling from ImageReader#detach" into tm-d1-dev am: 00d8fb50

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



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