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

[automerger skipped] Security fix for VPN app killable via lockscreen. am: 0fddfa03 am: adbb6b6d -s ours am: ee8f9d77 -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/+/27198359



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