Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc am: 294f9ae45b
am: 66aec9074f

Change-Id: Ib7bb8eff71a9358bea9a1425b08e9a43d3f2cb2c