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

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

Change-Id: I088dfe837eb986c2de792d0672a2e707112b6042