Merge "Convert apct/telephonyservices/unit_test-cloud-tf to Test Mapping Suite." am: bab493ca2b
am: 3e38984266

Change-Id: I6710b4d9b31149310b7db857f63b26362b68c5c2