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

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



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