Merge "Fix CTS_5.0_r3 720p_preview/1080p_recording failures b/22467525" into lollipop-cts-dev
automerge: d4a695a

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