Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
am: 5752c469e4

Change-Id: I0d0dd22b7e12f2383522eb7a70f73d3f6a2cafef