qcom-common: network scan fix

Change-Id: I2cef873bd51710be66a795906646b4fcefe94f8c
Merge remote-tracking branch 'cm/cm-12.0' into HEAD