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

Change-Id: I2d65bf74d73b64543bab2e033db36a25e8981831