[automerger skipped] Merge "Disable sockets and DNS if process lacks INTERNET permission." am: 4ce5c9c101 am: 43e6ff5364 -s ours
am skip reason: Change-Id If002280fbad493dfc2db3d9d505c0257d49a9056 with SHA-1 4b667b529a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348586
Change-Id: Ib9649cba9bd46a0dc9de42dc89775cc19fff8e57
This commit is contained in: