Merge "camera2 ndk: Fix error code passed on ACameraDevice_ErrorStateCallback." am: 31215a03a3
am: d7d5ad51d1

Change-Id: I528a2d2ef191b77aaade772fe85d2f6b61b10915