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

Change-Id: Ieb1a80d8ca3cd5cf136e810633e2b7277504efd5