Merge Android 12

Bug: 202323961
Merged-In: I41164ccc5c7eeb1bbc85b071bb79a3a39ddd6ec6
Change-Id: I2d0e5b3a50b91dd08330ec2fa6a9e0729237a097

Android.bp

diff --git a/Android.bp b/Android.bp
index 2996b96..38efe27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,7 +46,6 @@
     },
     static_libs: ["time_zone_updater"],
     platform_apis: true,
-    certificate: "platform",
     privileged: true,
     required: ["com.android.timezone.updater.xml"],
 }

res/values-ne/strings.xml

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 5fb34f5..9f4a736 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4941707838271462527">"प्रामाणिक समय अद्यावधिककर्ता"</string>
+    <string name="app_name" msgid="4941707838271462527">"समय क्षेत्र अद्यावधिककर्ता"</string>
 </resources>