Merge "Passpoint 2.0: Remove OSU/OSU2 Packages" into pi-dev