am 2d3c3e14: Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE

* commit '2d3c3e145545f0920f38340a8702d39e5ae8a792':
  Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE