[automerger skipped] Merge "Security fix for VPN app killable via lockscreen."...

[automerger skipped] Merge "Security fix for VPN app killable via lockscreen." into udc-dev am: a72e33cc am: c8c4b263 am: f9cd27dc -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/+/27145545



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