[automerger skipped] Merge "DO NOT MERGE Test: .ActivityManagerAmStartOptionsTests: Waiting for SingleTaskActivity transition idle" into pie-cts-dev am: 0b857c60d4 -s ours am: 5f13ca0895 -s ours am: c2309dac5b am: be32a6322d am: 92a40ce3a4
am: 4ae9fed51d -s ours
am skip reason: subject contains skip directive

Change-Id: I53b58421794c43b82ad47f75c306afda6b5a43d3