am 909d576c: am 63918bdc: am b3c21903: Merge "Fix CTS_5.0_r3 720p_preview/1080p_recording failures b/22467525" into lollipop-cts-dev automerge: d4a695a

* commit '909d576c0838de3bb9dbdbb77d2ea599b24f2e34':
  Fix CTS_5.0_r3 720p_preview/1080p_recording failures b/22467525