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

Change-Id: I8b27ea87cb0177e3342db2c5578d9d6eb38c313a