Merge "Replace calls for updating permission to protect sockets from VPN" into main am: 5d4b7c17d0 am: 2a96cb5a7a am: f3cc865274

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

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