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

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

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