am 3df162c4: am 880d1d1c: am 18ea82b0: am 3b885659: am 6307e355: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev

* commit '3df162c49e4141f06692252fb354b1f815bdf011':