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