Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" into oc-dev am: c367ee166b
am: 050d9d32c1

Change-Id: I64c7aae182d69fc4106f9cbe68317f313c703918