Merge "Reset a network mode of each SIM from system property"
am: a2c72e709f

Change-Id: I298cd698b3479339dc3aadc084dd4480e24b4526