Fix CtsVerifier Loopback audio test layout for small round screens

Also added a missing hardware feature

Bug: 24300679
Change-Id: I5e1e26ebdadbda9898451abaf418954c30919435
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 9d9b6df..2ea8fd7 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -1742,6 +1742,7 @@
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_audio" />
             <meta-data android:name="test_required_features" android:value="android.hardware.microphone" />
+            <meta-data android:name="test_required_features" android:value="android.hardware.audio.output" />
             <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" />
             <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television" />
         </activity>
diff --git a/apps/CtsVerifier/res/layout/audio_loopback_activity.xml b/apps/CtsVerifier/res/layout/audio_loopback_activity.xml
index 626ac4f..773ee9d 100644
--- a/apps/CtsVerifier/res/layout/audio_loopback_activity.xml
+++ b/apps/CtsVerifier/res/layout/audio_loopback_activity.xml
@@ -19,28 +19,35 @@
         android:padding="10dip"
         android:orientation="vertical">
 
-  <TextView
+  <ScrollView
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:scrollbars="vertical"
-      android:gravity="bottom"
-      android:id="@+id/info_text"
-      android:text="@string/audio_loopback_instructions" />
-  <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical">
+      android:layout_height="match_parent"
+      android:id="@+id/scrollView">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+      <TextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:scrollbars="vertical"
+          android:gravity="bottom"
+          android:id="@+id/info_text"
+          android:text="@string/audio_loopback_instructions" />
+
       <Button
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:id="@+id/audio_loopback_plug_ready_btn"
           android:text="@string/audio_loopback_plug_ready_btn"/>
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/audio_loopback_layout">
+      <LinearLayout
+          android:orientation="vertical"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:id="@+id/audio_loopback_layout">
 
         <TextView
             android:layout_width="wrap_content"
@@ -75,9 +82,9 @@
             android:layout_height="wrap_content"
             android:text="@string/audio_loopback_results_text"
             android:id="@+id/audio_loopback_results_text"/>
+      </LinearLayout>
+      <include layout="@layout/pass_fail_buttons" />
     </LinearLayout>
-    </LinearLayout>
-
-  <include layout="@layout/pass_fail_buttons" />
+  </ScrollView>
 
 </LinearLayout>
\ No newline at end of file