Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5 am: 539eaa34d5 am: 701e558586
am: 075e8da2a0

Change-Id: Ie578966f612bd9033b25a88b227fd6811207a332