[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: 458b7eb7 -s ours am: 7196f1d3 -s ours am: 378f8338 -s ours

am skip reason: skipped by fayey

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



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