[automerger skipped] Security fix for VPN app killable via lockscreen. am: 0fddfa039d am: 0ee0a19870 -s ours am: 458b7eb721 -s ours am: 7196f1d331 -s ours am: 378f833829 -s ours am: c40f15c348 -s ours

am skip reason: skipped by fayey

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

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