Merge "Record videos of the flicker tests"
am: 6d5457bbb8

Change-Id: I974be246c76a157f28bc232f0a52ee0a0ace6378