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

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

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



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