Merge "wifi: add CTS tests for Passpoint parsing APIs" am: 66d2bf1fe9
am: 8376afc701

Change-Id: I7865133af1a2eb56a98bf8e1a8f74f225a9ba925