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

Change-Id: I9e25d71fe76aa2412a290d0b40fd76ad9f9fa976