[automerger skipped] Security fix for VPN app killable via lockscreen. am: 0fddfa039d am: adbb6b6d20 -s ours am: ee8f9d77f9 -s ours am: aa29cd8590 -s ours

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

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

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