Merge "DO NOT MERGE Fixing layout of several test suites for round screens." into nougat-mr1-cts-dev