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

Change-Id: Ie27e541ed60edc43f518f041f7200d29612677c5