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

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