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

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