Merge "Add initial MIC e-label for JP SKU of F10" into tm-qpr-dev am: 30b8874571

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/20579553

Change-Id: I1e7fd36e25369d6bb5eebd5ba4902ff0125edae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

device-felix.mk

@@ -185,7 +185,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/felix/powerstats/felix
+    device/google/felix/powerstats/felix \
+    device/google/felix
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
@@ -242,7 +243,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # SKU specific RROs
 PRODUCT_PACKAGES += \
-    SettingsOverlayGPQ72
+    SettingsOverlayG0B96
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts

felix/overlay_packages/SettingsOverlayG0B96/Android.bp

@@ -3,6 +3,6 @@ package {
 }
 
 runtime_resource_overlay {
-    name: "SettingsOverlayGPQ72",
+    name: "SettingsOverlayG0B96",
     product_specific: true,
 }

felix/overlay_packages/SettingsOverlayG0B96/AndroidManifest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.overlay.gpq72">
+    package="com.android.settings.overlay.g0b96">
     <application android:hasCode="false" />
     <overlay android:targetPackage="com.android.settings"
              android:requiredSystemPropertyName="ro.boot.hardware.sku"
-             android:requiredSystemPropertyValue="GPQ72"
+             android:requiredSystemPropertyValue="G0B96"
              android:isStatic="true" />
 </manifest>