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

Change-Id: I3d2e754e477a4078f4f602cb3011c064031ccfbf