Merge changes from topics 'Passpoint API update', 'Passpoint intent update' am: 5df03b3d74
am: 39df78ecc7

Change-Id: I5c86f4dd87a369640248a3fdd953912f0d92e8f4