Merge "Revert "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CON..."" am: 3ea732de43 am: b5fb9726b7 am: c9531fa6c6

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

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