Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev am: 5af90f9fc6
am: 38b792bed6

Change-Id: Ie5b2854bd9c3081dbcd4e405f7733abe3767e12a