Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: ad65696800
am: 9e3b7e2589

Change-Id: I7860a70a1cb206f4af24441886efa2cb9512b3b5