Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: Ib8a7f3454d509d68d62210f286107d4f07fb86c2
BUG: 129345239
diff --git a/res/layout/link_viewer_activity.xml b/res/layout/link_viewer_activity.xml
index 5712836..986c02e 100644
--- a/res/layout/link_viewer_activity.xml
+++ b/res/layout/link_viewer_activity.xml
@@ -28,7 +28,7 @@
         app:title="@string/app_name"/>
 
     <TextView
-        style="@style/TextAppearance.Car.Body1"
+        style="?android:attr/textAppearanceLarge"
         android:id="@+id/url_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 7127665..31294d0 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -15,7 +15,7 @@
 -->
 <resources>
     <!-- The theme for the LinkViewerActivity. -->
-    <style name="AppTheme" parent="Theme.CarSupportWrapper.NoActionBar" >
+    <style name="AppTheme" parent="android:Theme.DeviceDefault.NoActionBar" >
        <item name="android:tint">@color/car_tint</item>
     </style>
 </resources>