Merge "Security fix for VPN app killable via lockscreen." into udc-dev am: a72e33cc90 am: c8c4b2637a

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

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