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

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