Merge "Stop using private API in Wifi Aware." am: fb2fb79953

Change-Id: I537b562581669096d88bf5bce4dbf8e5c9b6aa5c