Merge "Reset a network mode of each SIM from system property" into pi-dev am: 14d88800c9
am: a997252f51

Change-Id: I1f0c400c721dd0d12920c42af1abc5d4725fa7b5