Merge "Enable Instant and ABI XML tags for CtsCarrierApiTestCases" am: de211838cd am: ce8cd2d152
am: 08f4457588

Change-Id: I463ad53df71baa3a2d254bf03c5a92a0f83d6d80