[automerger skipped] Merge "Move deduceRestrictedCapability to libs/net and rename it" am: 6098194278 am: af5827c506 am: 032eba8da7 -s ours

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

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

Change-Id: I6a434d0839828f3c2692a5cc8d523dbddc92b4ef
tree: a21c6566694fb37f80fd55902135139dbeab75bf
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING