Merge "Use MultiSimTestsPreparer to set DSDS config" into qt-dev
am: d47c617079

Change-Id: I0eedfdd77975d7cb53f1a5009b25658cb53679f9