Adds PNO related changes for converged scan Change-Id: Ia18e48645d511134698777b334348d68daf2dbee CRs-Fixed: 1095299