am 55f3df10: am 4db526ff: am d4a695ab: Merge "Fix CTS_5.0_r3 720p_preview/1080p_recording failures b/22467525" into lollipop-cts-dev

* commit '55f3df10f97ea5c953d1da0307721f996cfacf8a':