[automerger skipped] Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'" am: 122a7b33ad am: 0036df97ca  -s ours
am: cee51971b8  -s ours

Change-Id: Iac88f6309a4cf9c654dfbc3217083d68e1f4f841