Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Icd8ec5a1f02245496e5e73c5a32218f9b58aad6a
diff --git a/Android.mk b/Android.mk
index 42eb514..9e6fa94 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,6 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt
 
 LOCAL_PACKAGE_NAME := CertInstaller
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index a1a8196..93c75b4 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -52,27 +52,48 @@
     <item msgid="375085478373011304">"ভিপিএন আৰু এপসমূহ"</item>
     <item msgid="692322974985472861">"ৱাই-ফাই"</item>
   </string-array>
-    <string name="certificate_capabilities_warning" msgid="4158609401937799110">"টোকা: এই প্ৰমাণপত্ৰ প্ৰদানকাৰীয়ে এই ডিভাইচটোৰ পৰা যোৱা আৰু ডিভাইচটোলৈ অহা সকলো ট্ৰেফিক পৰ্যবেক্ষণ কৰিব পাৰে।"</string>
-    <string name="wifi_title" msgid="8475811746333426489">"ৱাই- ফাই প্ৰ\'ফাইল"</string>
-    <string name="wifi_detail_title" msgid="3627332137252994395">"%sৰ সবিশেষ"</string>
-    <string name="wifi_detail_label" msgid="3032151019356747583">"সবিশেষ"</string>
-    <string name="wifi_install_label" msgid="1449629407724323233">"ইনষ্টল কৰক"</string>
-    <string name="wifi_installing_label" msgid="8387393993627129025">"ইনষ্টল কৰি থকা হৈছে"</string>
-    <string name="wifi_cancel_label" msgid="1328748037608392134">"বাতিল কৰক"</string>
-    <string name="wifi_dismiss_label" msgid="1916684434873972698">"অগ্ৰাহ্য কৰক"</string>
-    <string name="wifi_no_config" msgid="1835743123288916755">"একো নাই"</string>
-    <string name="wifi_config_text" msgid="8259587306773310314">"নাম: %1$s\nFQDN: %2$s\nৰ\'মিঙৰ বাণিজ্যিক গোটসমূহ: %3$s\nৰাষ্ট্ৰ: %4$s\nসত্যাপন পদ্ধতি: EAP-%5$s\n"</string>
-    <string name="wifi_ttls_config_text" msgid="2002413183253872168">"ব্য়ৱহাৰকাৰীৰ নাম: %s\n"</string>
-    <string name="wifi_tls_config_text" msgid="9062328536640168510">"ক্লায়েণ্টৰ প্ৰমাণপত্ৰ:\n%1$s\nকী: %2$s\n"</string>
-    <string name="wifi_sim_config_text" msgid="1666019954520831840">"ছিম: %s\n"</string>
-    <string name="wifi_trust_config_text" msgid="5916047381475747783">"প্ৰমাণপত্ৰখনক বিশ্বাস কৰক:\n%s\n"</string>
-    <string name="install_done_title" msgid="4822989918460334497">"ক্ৰেডেনশ্বিয়েলসমূহ ইনষ্টল কৰা হ\'ল"</string>
-    <string name="install_done" msgid="1522718684172097080">"<xliff:g id="NAME">%1$s</xliff:g>ৰ ক্ৰেডেনশ্বিয়েলসমূহ ৱাই-ফাইয়ে ছেভ কৰা নেটৱৰ্কসমূহত যোগ দিয়া হ\'ল।"</string>
-    <string name="done_label" msgid="5597425930652904250">"সম্পন্ন কৰা হ\'ল"</string>
-    <string name="wifi_installer_detail" msgid="63879632832701669">"<xliff:g id="NAME">%1$s</xliff:g>ৰ যোগেৰে উপলব্ধ নেটৱর্কসমূহৰ সৈতে সংযোগ কৰিবলৈ ৱাই-ফাইৰ ক্ৰেডেনশ্বিয়েলসমূহ ইনষ্টল কৰক।"</string>
-    <string name="wifi_installer_download_error" msgid="5429453090956277692">"ডাউনল\'ড কৰা ফাইলটোত সমস্য়া আছে আৰু ইয়াক ইনষ্টল কৰিব নোৱাৰি। আপুনি সঠিক উৎসৰ পৰা ফাইলটো ডাউনল\'ড কৰিছিলনে সুনিশ্চিত কৰক।"</string>
-    <string name="wifi_installer_fail" msgid="894483173306576331">"ৱাই-ফাইৰ ক্ৰেডেনশ্বিয়েলসমূহ ইনষ্টল কৰিব নোৱাৰি। ফাইলটো আকৌ ডাউনল\'ড কৰিবলৈ চেষ্টা কৰক।"</string>
-    <string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"ইনষ্টলেশ্বন বাতিল কৰা হ\'ল"</string>
-    <string name="wifi_installer_fail_title" msgid="5547079779067835479">"ইনষ্টল কৰিব নোৱাৰি"</string>
-    <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"ৱাই-ফাই অন কৰি আকৌ চেষ্টা কৰক।"</string>
+    <!-- no translation found for wifi_title (8475811746333426489) -->
+    <skip />
+    <!-- no translation found for wifi_detail_title (3627332137252994395) -->
+    <skip />
+    <!-- no translation found for wifi_detail_label (3032151019356747583) -->
+    <skip />
+    <!-- no translation found for wifi_install_label (1449629407724323233) -->
+    <skip />
+    <!-- no translation found for wifi_installing_label (8387393993627129025) -->
+    <skip />
+    <!-- no translation found for wifi_cancel_label (1328748037608392134) -->
+    <skip />
+    <!-- no translation found for wifi_dismiss_label (1916684434873972698) -->
+    <skip />
+    <!-- no translation found for wifi_no_config (1835743123288916755) -->
+    <skip />
+    <!-- no translation found for wifi_config_text (8259587306773310314) -->
+    <skip />
+    <!-- no translation found for wifi_ttls_config_text (2002413183253872168) -->
+    <skip />
+    <!-- no translation found for wifi_tls_config_text (9062328536640168510) -->
+    <skip />
+    <!-- no translation found for wifi_sim_config_text (1666019954520831840) -->
+    <skip />
+    <!-- no translation found for wifi_trust_config_text (5916047381475747783) -->
+    <skip />
+    <!-- no translation found for install_done_title (4822989918460334497) -->
+    <skip />
+    <!-- no translation found for install_done (1522718684172097080) -->
+    <skip />
+    <!-- no translation found for done_label (5597425930652904250) -->
+    <skip />
+    <!-- no translation found for wifi_installer_detail (63879632832701669) -->
+    <skip />
+    <!-- no translation found for wifi_installer_download_error (5429453090956277692) -->
+    <skip />
+    <!-- no translation found for wifi_installer_fail (894483173306576331) -->
+    <skip />
+    <!-- no translation found for wifi_installer_fail_no_wifi_title (8358191074828840533) -->
+    <skip />
+    <!-- no translation found for wifi_installer_fail_title (5547079779067835479) -->
+    <skip />
+    <!-- no translation found for wifi_installer_fail_no_wifi (2044576439984209921) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cc9af49..a75c831 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -74,5 +74,5 @@
     <string name="wifi_installer_fail" msgid="894483173306576331">"Die WLAN-Anmeldedaten können nicht installiert werden. Lade die Datei erneut herunter."</string>
     <string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"Installation abgebrochen"</string>
     <string name="wifi_installer_fail_title" msgid="5547079779067835479">"Installation nicht möglich"</string>
-    <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Aktiviere WLAN und versuche es erneut."</string>
+    <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Aktiviere WLAN und versuche es noch einmal."</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index a60d859..2a08c73 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -52,7 +52,6 @@
     <item msgid="375085478373011304">"VPN and apps"</item>
     <item msgid="692322974985472861">"Wi-Fi"</item>
   </string-array>
-    <string name="certificate_capabilities_warning" msgid="4158609401937799110">"Note: The issuer of this certificate may inspect all traffic to and from the device."</string>
     <string name="wifi_title" msgid="8475811746333426489">"Wi-Fi Profile"</string>
     <string name="wifi_detail_title" msgid="3627332137252994395">"Details for %s"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"Details"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 43483b4..d75bef3 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -52,7 +52,6 @@
     <item msgid="375085478373011304">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎VPN and apps‎‏‎‎‏‎"</item>
     <item msgid="692322974985472861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎Wi-Fi‎‏‎‎‏‎"</item>
   </string-array>
-    <string name="certificate_capabilities_warning" msgid="4158609401937799110">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎Note: The issuer of this certificate may inspect all traffic to and from the device.‎‏‎‎‏‎"</string>
     <string name="wifi_title" msgid="8475811746333426489">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‎Wi-Fi Profile‎‏‎‎‏‎"</string>
     <string name="wifi_detail_title" msgid="3627332137252994395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎Details for %s‎‏‎‎‏‎"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎Details‎‏‎‎‏‎"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f4482b5..d6d42e2 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -53,7 +53,7 @@
     <item msgid="692322974985472861">"Wi-Fi"</item>
   </string-array>
     <string name="certificate_capabilities_warning" msgid="4158609401937799110">"Napomena: izdavatelj tog certifikata može pregledavati sav promet upućen s uređaja i na uređaj."</string>
-    <string name="wifi_title" msgid="8475811746333426489">"Profil Wi-Fi-ja"</string>
+    <string name="wifi_title" msgid="8475811746333426489">"Profil Wi-Fija"</string>
     <string name="wifi_detail_title" msgid="3627332137252994395">"Pojedinosti za %s"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"Pojedinosti"</string>
     <string name="wifi_install_label" msgid="1449629407724323233">"Instaliraj"</string>
@@ -69,9 +69,9 @@
     <string name="install_done_title" msgid="4822989918460334497">"Vjerodajnice su instalirane"</string>
     <string name="install_done" msgid="1522718684172097080">"<xliff:g id="NAME">%1$s</xliff:g> vjerodajnice dodane su u spremljene Wi-Fi mreže."</string>
     <string name="done_label" msgid="5597425930652904250">"GOTOVO"</string>
-    <string name="wifi_installer_detail" msgid="63879632832701669">"Instalirajte vjerodajnice Wi-Fi-ja da biste se povezivali s mrežama dostupnim putem <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_installer_detail" msgid="63879632832701669">"Instalirajte vjerodajnice Wi-Fija da biste se povezivali s mrežama dostupnim putem <xliff:g id="NAME">%1$s</xliff:g>."</string>
     <string name="wifi_installer_download_error" msgid="5429453090956277692">"Na preuzetoj datoteci ima problema, pa je nije moguće instalirati. Provjerite jeste li preuzeli datoteku iz točnog izvora."</string>
-    <string name="wifi_installer_fail" msgid="894483173306576331">"Instaliranje vjerodajnica Wi-Fi-ja nije uspjelo. Ponovo pokušajte preuzeti datoteku."</string>
+    <string name="wifi_installer_fail" msgid="894483173306576331">"Instaliranje vjerodajnica Wi-Fija nije uspjelo. Ponovo pokušajte preuzeti datoteku."</string>
     <string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"Instalacija otkazana"</string>
     <string name="wifi_installer_fail_title" msgid="5547079779067835479">"Instaliranje nije moguće"</string>
     <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Uključite Wi-Fi i pokušajte ponovo."</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index c8aeb01..8032cd0 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -52,12 +52,12 @@
     <item msgid="375085478373011304">"VPN ଓ ଆପ୍‍"</item>
     <item msgid="692322974985472861">"ୱାଇ-ଫାଇ"</item>
   </string-array>
-    <string name="certificate_capabilities_warning" msgid="4158609401937799110">"ଧ୍ୟାନଦିଅନ୍ତୁ: ଏହି ସର୍ଟିଫିକେଟ୍ ଜାରି କରିଥିବା କମ୍ପାନୀ, ଡିଭାଇସ୍‌ରୁ ଯାଉଥିବା ଓ ଆସୁଥିବା ସମସ୍ତ ଟ୍ରାଫିକ୍‌କୁ ଯାଞ୍ଚ କରିପାରନ୍ତି।"</string>
     <string name="wifi_title" msgid="8475811746333426489">"ୱାଇ-ଫାଇ ପ୍ରୋଫାଇଲ୍‍"</string>
     <string name="wifi_detail_title" msgid="3627332137252994395">"%sର ବିବରଣୀ"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"ବିବରଣୀ"</string>
     <string name="wifi_install_label" msgid="1449629407724323233">"ଇନଷ୍ଟଲ୍‍"</string>
-    <string name="wifi_installing_label" msgid="8387393993627129025">"ଇନଷ୍ଟଲ୍ କରାଯାଉଛି"</string>
+    <!-- no translation found for wifi_installing_label (8387393993627129025) -->
+    <skip />
     <string name="wifi_cancel_label" msgid="1328748037608392134">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
     <string name="wifi_dismiss_label" msgid="1916684434873972698">"ଖାରଜ"</string>
     <string name="wifi_no_config" msgid="1835743123288916755">"କିଛିନୁହେଁ"</string>
@@ -72,7 +72,10 @@
     <string name="wifi_installer_detail" msgid="63879632832701669">"<xliff:g id="NAME">%1$s</xliff:g> ଜରିଆରେ ଉପଲବ୍ଧ ନେଟୱର୍କଗୁଡ଼ିକ ସହ ସଂଯୋଗ କରିବାକୁ ୱାଇ-ଫାଇ କ୍ରେଡେନସିଆଲ୍ସ ଇନଷ୍ଟଲ୍‍ କରନ୍ତୁ।"</string>
     <string name="wifi_installer_download_error" msgid="5429453090956277692">"ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା ଫାଇଲ୍‍ରେ ସମସ୍ୟା ରହିଛି ଏବଂ ଇନଷ୍ଟଲ୍‍ କରାଯାଇପାରିବ ନାହିଁ। ଆପଣ ସଠିକ୍‍ ସୋର୍ସରୁ ଫାଇଲ୍‍ ଡାଉନଲୋଡ୍ କରିଥିବା ନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="wifi_installer_fail" msgid="894483173306576331">"ୱାଇ-ଫାଇଲ କ୍ରେଡେନସିଆଲ୍ସ ଇନଷ୍ଟଲ୍‍ କରିପାରିବ ନାହିଁ। ଫାଇଲ୍‍ ପୁଣି ଡାଉନଲୋଡ୍ କରିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"ଇନଷ୍ଟଲେଶନ୍ କ୍ୟାନ୍ସଲ୍‍ କରାଯାଇଛି"</string>
-    <string name="wifi_installer_fail_title" msgid="5547079779067835479">"ଇନଷ୍ଟଲ୍‍ କରାଯାଇପାରିବ ନାହିଁ"</string>
-    <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"ୱାଇ-ଫାଇ ଅନ୍‍ କରନ୍ତୁ ଏବଂ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+    <!-- no translation found for wifi_installer_fail_no_wifi_title (8358191074828840533) -->
+    <skip />
+    <!-- no translation found for wifi_installer_fail_title (5547079779067835479) -->
+    <skip />
+    <!-- no translation found for wifi_installer_fail_no_wifi (2044576439984209921) -->
+    <skip />
 </resources>