[automerger skipped] Security fix for VPN app killable via lockscreen. am: d2ead2aa -s ours

am skip reason: Merged-In I384699d478e5abcee3a165afc45211b9ed96334a with SHA-1 598d7a18 is already in history

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



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