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

Change-Id: I2369d56f60d53ce8ab9f4d10822dec29ab295d51