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

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



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