Merge "WifiScanner: Change hidden/PNO scan params" am: b1161c83f9
am: afef95d3c5

Change-Id: I596db3965d8b99ff303bc1d21c9b19c87aea4bec