[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

Change-Id: I8e3e3f53e84c694734e2b61f23a692026c49c123