am c95ce81a: am d12ba605: am 43abff1c: am a277f175: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev automerge: 6307e35

* commit 'c95ce81a986a05db09b31a766edd6de394d41821':
  Camera2: Fix waiting for surface size change