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

am: 0036df97ca  -s ours

Change-Id: Ie27e541ed60edc43f518f041f7200d29612677c5
This commit is contained in:
Cassie Han
2018-04-19 14:04:53 -07:00
committed by android-build-merger

Diff Content Not Available