Merge "Revert "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite."" am: 8e56dc3951 am: 937c5b8b40

Change-Id: Iabfdbe81c96ae2071a4e2baa2f74d14008f25aec