Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API"