Merge "Merge "DO NOT MERGE Fixing layout of audio test suite for round screens." into nougat-mr1-cts-dev am: 9622c61acf  -s ours" into nyc-mr1-dev am: 4b3ad40b92
am: 468a429272

Change-Id: If59f0aa9b500ff83706ab00629e58a8305ea23d6