[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e89
am: 33b1bfb8 -s ours
am skip reason: change_id Ib448a6901581294050fc988ed9c16f7e93066860 with SHA1 9761dd46 is in history
Change-Id: I1486dd381d91fcbc415c03b616d716165325a689