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

Change-Id: Id1d2a1e2dd66385bb6fd6f617dbe0fcd97784df8