am 1f51808a: Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE

* commit '1f51808ad12e52b44097b4bbe0cfb454ed21687f':
  Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE