Merge "TEST_MAPPING: Remove CtsActivityManagerDeviceSdk25TestCases"