Merge "DO NOT MERGE Fix CtsActivityManagerDeviceTestCases fails" into pie-gsi