Merge "Revert "keystore: Allow network_stack uid to use AID_WIFI""
am: be24e3f390

Change-Id: Iceeecd170c1b5069f6052b21a7591687c54cd18b