Merge "Update VPN app exclusion list when packages are added or removed" am: 1af24cfdbf am: 5583658286 am: 1da9a8ec6e am: e5e33d71fb

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

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