Merge "Convert apct/framework/presubmit-cloud-tf to Test Mapping Suite." am: 888c3b0347
am: f5c7e1b90a

Change-Id: I2e584c87d94b130ff6f68da2392fe752a9c36694