DO NOT MERGE - Revert workaround for KeyguardLock problem

This reverts commit 3ee0cad5f5e21a24dbe43d21afaac1dd76a2059b.

Because commit 284b62e1b8c3419bfd02c6fea5ba0a68146c06f8 fixes the underlying
conflict between DeviceAdmin policies and apps attempting to disable the
Keyguard Lock, this patch is no longer required.

Accounts with a server policy requiring a device PIN or Password will
now work properly.

Bug: 2737842
Change-Id: I533c27a01a8a331dc11a0cb84bcc78f48edf621c
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 19dea82..a21a23d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -235,13 +235,6 @@
             <intent-filter>
                 <action android:name="android.intent.action.DEVICE_STORAGE_OK" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_ADDED" />
-                <action android:name="android.intent.action.PACKAGE_CHANGED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-                <data android:scheme="package" />
-            </intent-filter>
-
         </receiver>
 
         <!-- Support for DeviceAdmin / DevicePolicyManager.  See SecurityPolicy class for impl. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d651d4..95b4e9e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -681,12 +681,6 @@
     <string name="device_admin_label">Email</string>
     <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
     <string name="device_admin_description">Enables server-specified security policies</string>
-    <!-- Title of keyguard-lock-disabled dialog box -->
-    <string name="keyguard_disabled_dlg_title">Screen lock disabled</string>
-    <!-- Message of keyguard-lock-disabled dialog box -->
-    <string name="keyguard_disabled_dlg_message_fmt">This account cannot be used while the
-        application \"<xliff:g id="application">%s</xliff:g>\" is installed, because it
-        interferes with the operation of the screen lock.</string>
 
     <!-- Notification message in notifications window when calendar sync is
          automatically enabled for pre-existing Exchange accounts on upgrade -->