[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: f323bb19 -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/+/27145545



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