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

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

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



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