Merge "Cherry-pick 'Remove the unnecessary action in NetworkSelectSettingActivity.'"