Merge "Add wifi permissions to shell" into oc-mr1-dev
am: d3428e9a3b

Change-Id: I4aa82e6a8a9e9a11415e3020d6508a83cdfb453e