Merge "DO NOT MERGE Fix CtsActivityManagerDeviceTestCases fails"