Merge "camera2 vndk: Improve error handling" am: 8a4e9b2b am: f9c4003e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2221403



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