Merge "Allow SimDialogActivity to be started for result"
am: 11d92e894a

Change-Id: I016022dbc01916c32511244c1031f9a15359ecf5