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

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



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