[automerger skipped] Merge "DO NOT MERGE Fix CtsActivityManagerDeviceTestCases fails"
am: dbe9e763fa -s ours
am skip reason: subject contains skip directive

Change-Id: I84206ddca4b6abbb0ca842b9056669ec16b832dd