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