Merge "Add null check for bssid in getScanResult" into udc-mainline-prod