[automerger skipped] Merge "Add bssid field in the ScanResultInfo class." am:...

[automerger skipped] Merge "Add bssid field in the ScanResultInfo class." am: 62f2d906 am: 64411890 -s ours am: ff7ab919 -s ours am: b683ce50 -s ours am: 8462695d -s ours

am skip reason: Change-Id Ia11f1954124f45f9586495f6be7fb7fb3430ae97 with SHA-1 12cbeff3 is in history

Change-Id: I62a66bc02e4a85962dcc918a19994b30f93d6fce