am 937ef8e5: am 268beed2: am 204828b7: am a18febd4: am 55f3df10: am 4db526ff: am d4a695ab: Merge "Fix CTS_5.0_r3 720p_preview/1080p_recording failures b/22467525" into lollipop-cts-dev

* commit '937ef8e5b14ec90b2a0831e4450cc86f9970a67a':