Merge "Create Espresso test for WifiSettings." into oc-dev am: 0d47527058
am: 44132cec43

Change-Id: I835e7acfd7c8e416318bc309032bcf0c9f6a9c8f