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

* commit '8ff07ad72ce6aeebd1bab6b89f4e4f0fc31407b7':