Merge "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite." am: 928f0bf26e am: f680f6037d

Change-Id: I240cfc417e55d19ee2443765d66721adc81cfc70