Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa am: 3c6305cc am: 887fd907 am: 79d9e996 Change-Id: I4ef57924507633315ed0dbd5f18abbd9138de572