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

Change-Id: I01f946cbb8d0927344d9ab4c7b044fa9c461a1d5