Merge "Add bssid field in the ScanResultInfo class." into rvc-dev am: a8782392d4

Change-Id: I3f58467fc4344019f01a3b417d24387fb0e25e5f