Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev