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

Change-Id: I5aca05099b7ab41885723d5da286747f2a8b6489