Merge "Fix DevicePolicyManager.isBackupServiceEnabled() breakage."