Merge Android R

Bug: 168057903
Merged-In: I23245c41193902c90a8fe44ec44ce91d76cdf294
Change-Id: I68f2219780e9da4d1c3586ed5fef5b053d21d5be

4 files changed, 3 insertions, 1 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2630422..69001e3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,10 +3,12 @@
         android:sharedUserId="android.uid.shared"
         android:sharedUserLabel="@string/sharedUserLabel">
 
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+
     <application android:label="@string/app_label"
-        android:icon="@drawable/app_icon"
         android:allowBackup="true"
         android:backupAgent="CallLogBackupAgent"
+        android:forceQueryable="true"
         android:usesCleartextTraffic="false">
 
         <meta-data android:name="com.google.android.backup.api_key"
diff --git a/res/drawable-hdpi/app_icon.png b/res/drawable-hdpi/app_icon.png
deleted file mode 100644
index 64eff00..0000000
--- a/res/drawable-hdpi/app_icon.png
+++ /dev/null
diff --git a/res/drawable-mdpi/app_icon.png b/res/drawable-mdpi/app_icon.png
deleted file mode 100644
index b4ee821..0000000
--- a/res/drawable-mdpi/app_icon.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/app_icon.png b/res/drawable-xhdpi/app_icon.png
deleted file mode 100644
index 6feeadf..0000000
--- a/res/drawable-xhdpi/app_icon.png
+++ /dev/null