Merge "Move deduceRestrictedCapability to libs/net and rename it" am: 6098194278 am: af5827c506

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

Change-Id: Idc33279ef58a6c2bc971271ccf85cafa264b1d1d