Merge "keystore: Allow network_stack uid to use AID_WIFI"
am: 9ff0edfe26

Change-Id: I96def81436ee5cfdf14bbc46c18154667be7ffe0