Merge "Remove the unnecessary action in NetworkSelectSettingActivity." into pi-dev am: a22c7cc534
am: 8ba045c4fd

Change-Id: I9c30f81b57ca85abee3236b3fa48e4c2cc486026