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

Change-Id: I7801f8cf8713658ce70b49650e3fdc818702e096