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

Change-Id: I91c1fa263b3870479440e93e23b1cff58325e494