Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
am: 666c9d7ea5

Change-Id: I1b193660453cbc492d83501f8e9fe3b544e6e4b2