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

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

am skip reason: skipped by fayey

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



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