Merge "[automerger skipped] Merge "DO NOT MERGE ActivityManagerAmStartOptionsTests: wait until home visible." into pie-cts-dev am: 1e357785cd -s ours am skip reason: subject contains skip directive"