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

Change-Id: I2d517f18f1cd9e412467785316c8b67e1a1a400d