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

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