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

Change-Id: I1cb9fabb9d3308312962305b6eb5d22314eb49a5