Merge "Fix network name for Passpoint network"
am: 742bd03f12

Change-Id: Ia9ae9d6034f72be5f8d34340efce5b52d71fa6c2