Merge "Fix infinite loop of launching Call accounts on multi-sim device" am: f94a301afa
am: 29e10c35c0

Change-Id: I395d2c92a3f9f726b036e62413a641c54da42aff