Merge "DO NOT MERGE Make sure tested video resolution is in supported video resolutions" into nougat-mr1-cts-dev