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

Change-Id: I4dd242caec0ee68cba67b1da85e83e53e6780286