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

Change-Id: Iebc1f993e0a3ccf86e813a52168431b624aa7716