am 98115660: (-s ours) am d95a340b: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev

* commit '9811566033a95fa9b92c500372642d108f9f8564':