Merge "Use additional interface for the WiFi Aware Discovery operations." into rvc-dev am: acf79bfacf

Change-Id: I0684a274a90e52e49008ee721182dc705e1f5a47