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