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