[automerger skipped] Merge "Move deduceRestrictedCapability to libs/net and...

[automerger skipped] Merge "Move deduceRestrictedCapability to libs/net and rename it" am: c6725ad2 am: b1d55e7f am: 8e7a6b58 -s ours

am skip reason: skip tag Change-Id I77970b3a5e5e0e9d263639694b1f06519169bf64 with SHA-1 cb163300 is already in history

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

Change-Id: I6a434d0839828f3c2692a5cc8d523dbddc92b4ef