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

* commit '880d1d1cbe042e15ee295f476629f0d44dc73f53':