Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021

Change-Id: I16d87836136f411e61756246817ed448d974bec4