Merge "DO NOT MERGE Fixing layout of several test suites for round screens." into nougat-mr1-cts-dev am: baa6894eeb  -s ours
am: 8c6fde5c85

Change-Id: Iae57d610e20f7b5ae53ea0e6d55427f67955feae