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

Change-Id: I4ef57924507633315ed0dbd5f18abbd9138de572