[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e894a am: 33b1bfb8fb -s ours am: f51dc265a0 -s ours
am:1984bd6d51-s ours am skip reason: change_id Ib448a6901581294050fc988ed9c16f7e93066860 with SHA19761dd4634is in history Change-Id: Ia28ae2172ac2ff9aa8d9b2e840289a4cd187f9e0
This commit is contained in: