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

Change-Id: I239a36244a2c5d4a1051a150af0439a73fd7adf8