Merge "Fix android.hardware.camera2.cts.RobustnessTest#testMandatoryOutputCombinations failure." into lollipop-cts-dev
automerge: e61db7d

* commit 'e61db7d32cba82f1e8e49e1aa451d3e2f6cfbb06':
  Fix android.hardware.camera2.cts.RobustnessTest#testMandatoryOutputCombinations failure.