Merge "Revert "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CON...""...

Merge "Revert "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CON..."" am: 3ea732de am: b5fb9726 am: c9531fa6 am: 658d3b01 am: a6130995

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



Change-Id: I4d7f3be8178a3111f43cf013ac5064c1931dd204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>