Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06
am: 3c6305cc55

Change-Id: I4e2461f68db983292c167a11746b8cfe47995e77