MAGECLOUD-5069 Fails when applied to Magento 2.3.5

[BarnyShergold]

Preconditions

1. Building Magento 2.3.5 on Cloud Edition

Steps to reproduce

1. Update composer.json to use "magento/magento-cloud-metapackage": "2.3.5"
2. Commit & Push

Expected result

1. Build & deploy process should run as normal

Actual result

1. Patches application fails :
   [2020-04-15 07:28:33] ERROR: The command "php ./vendor/bin/ece-patches apply" failed. In Applier.php line 140:

      The command "'git' 'apply' '--check' '--reverse' '/app/vendor/magento/magen  
      to-cloud-patches/patches/MAGECLOUD-5069__fpc_is_getting_disabled_during_dep  
      loyments__2.3.2.patch'" failed.                                              
                                                                                   
      Exit Code: 1(General error)                                                  
                                                                                   
      Working directory: /app                                                      
                                                                                   
      Output:                                                                      
      ================                                                             
                                                                                   
                                                                                   
      Error Output:                                                                
      ================                                                             
      error: patch failed: vendor/magento/module-page-cache/Model/Layout/LayoutPl  
      ugin.php:20                                                                  
      error: vendor/magento/module-page-cache/Model/Layout/LayoutPlugin.php: patc  
      h does not apply                                                             
      error: vendor/magento/module-page-cache/Observer/SwitchPageCacheOnMaintenan  
      ce.php: already exists in working directory                                  
      error: patch failed: vendor/magento/module-page-cache/Observer/SwitchPageCa  
      cheOnMaintenance/PageCacheState.php:14                                       
      error: vendor/magento/module-page-cache/Observer/SwitchPageCacheOnMaintenan  
      ce/PageCacheState.php: patch does not apply                                  
      error: patch failed: vendor/magento/module-page-cache/Test/Unit/Model/Layou  
      t/LayoutPluginTest.php:27                                                    
      error: vendor/magento/module-page-cache/Test/Unit/Model/Layout/LayoutPlugin  
      Test.php: patch does not apply                                               
      error: vendor/magento/module-page-cache/Test/Unit/Observer/SwitchPageCacheO  
      nMaintenanceTest.php: already exists in working directory                    
      error: patch failed: vendor/magento/module-page-cache/etc/events.xml:57      
      error: vendor/magento/module-page-cache/etc/events.xml: patch does not appl  
      y                                                                            
   

PROBLEM TRACED TO -
vendor/magento/module-page-cache/Model/Layout/LayoutPlugin.php
vendor/magento/module-page-cache/Test/Unit/Model/Layout/LayoutPluginTest.php

These files have changed since 2.3.4 (mostly refactoring) so the patch no-longer applies.
Tests also show that if this patch DID work it would be the only failing patch.

[shiftedreality]

It's fixed in #30

Will be released with magento 2.3.5

[shiftedreality]

Also delivered into develop branch