Merge \"Remove the DMAgent whitelisting\" into nyc-mr1-dev

am: bf6c6b44e1

Change-Id: I85b2fabd9f33697be15bccbaf8602fa525012772

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

@@ -5111,10 +5111,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
         boolean legacyApp = false;
         if (ai.targetSdkVersion <= Build.VERSION_CODES.M) {
             legacyApp = true;
-        } else if ("com.google.android.apps.enterprise.dmagent".equals(ai.packageName)
-                && ai.versionCode == 697) {
-            // TODO: STOPSHIP remove this (revert ag/895987) once a new prebuilt is dropped
-            legacyApp = true;
         }
 
         final int rawStatus = getEncryptionStatus();