Merge "Convert apct/framework/ui_services_test-cloud-tf to Test Mapping Suite." am: c83781809e am: 88c08976fb

Change-Id: Idf7fdbff8656ddbff22aa3a7a4ecbbadf5b0bd3b