Merge "Fix tint of battery icon" into udc-qpr-dev am: 8a9074278a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842149

Change-Id: I854f3002c282c6909bd79eeecb839045ee8119ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/drawable/ic_battery_full.xml b/res/drawable/ic_battery_full.xml
index 8b1321f..5dfac55 100644
--- a/res/drawable/ic_battery_full.xml
+++ b/res/drawable/ic_battery_full.xml
@@ -18,7 +18,7 @@
         android:height="24dp"
         android:viewportWidth="960"
         android:viewportHeight="960"
-        android:tint="?attr/colorControlNormal">
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M320,880Q303,880 291.5,868.5Q280,857 280,840L280,200Q280,183 291.5,171.5Q303,160 320,160L400,160L400,80L560,80L560,160L640,160Q657,160 668.5,171.5Q680,183 680,200L680,840Q680,857 668.5,868.5Q657,880 640,880L320,880Z"/>