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

Change-Id: I5a2ab79e0901bbcb5b0c42f4a65974f2ca8c4518