[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 skip reason: Change-Id Ia11f1954124f45f9586495f6be7fb7fb3430ae97 with SHA-1 12cbeff3 is in history
Change-Id: I9fa6bf54927c9cde61bfafe3e766e609c1abed8b