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

Change-Id: I19d91f8133c7294de3350277efff339bd75f42b8