Merge "Added ABI XML tag for CtsSampleDeviceTestCases."