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

Change-Id: I20abe4c23f04ba1af9f0b32477c555062517ddcb