Merge "wpa_supplicant: Remove unnecessary permissions from system_server" am: e1a350a035
am: 790052147c

Change-Id: Icf0aefc596f8c3df64be9bc68b4c1f4243059747