Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" am: a9cbda5bd8 am: 1d82eb0612
am: 0d89fcc628

Change-Id: Ia6549a6fa404518d091ecb7bd74ece41f547d8c7