Fix ExtraText lint errors

Android lint is being updated, and now
checks for extra text in android manifest
and resource xml files.

Bug: 236431222
Test: Presubmits
Change-Id: Ia74638562af2ba068546cb3c994e1f7f784cf663

res/drawable/color_bar_progress.xml

@@ -21,7 +21,7 @@
             <size android:height="10dp" />
             <solid android:color="@*android:color/white_disabled_material" />
         </shape>
-    </item>r
+    </item>
     <item android:id="@android:id/secondaryProgress">
         <scale android:scaleWidth="100%">
             <shape android:shape="rectangle"

res/layout/battery_header.xml

@@ -47,7 +47,6 @@
             android:layout_marginTop="8dp"
             android:minLines="3"
             android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
-            android:textColor="?android:attr/textColorPrimary"/>
 
     </LinearLayout>
 
@@ -57,4 +56,4 @@
         android:layout_height="@dimen/battery_meter_height"
         android:layout_gravity="center"/>
 
-</LinearLayout>
+</LinearLayout>