[automerger skipped] Merge "Cherry-pick 'Remove the unnecessary action in NetworkSelectSettingActivity.'" am: c4655d3938
am: 8b8fd0195d  -s ours

Change-Id: I328500a9492fa6a80a8296518ada089fac01eacb