[automerger skipped] Security fix for VPN app killable via lockscreen. am:...

[automerger skipped] Security fix for VPN app killable via lockscreen. am: d2ead2aa -s ours am: a1e35b88 -s ours am: 669fb5f4 -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: Icc06c17313bc8836d3f208bbfbd81672ff89061c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>