[automerger skipped] Merge "Move deduceRestrictedCapability to libs/net and rename it" am: e36b232c4a am: 929c1f171a am: 5d43332227 -s ours

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

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

Change-Id: I6a434d0839828f3c2692a5cc8d523dbddc92b4ef
tree: ba7319d0fd4b2b3283f4b3fb39159ac9be3d38ee
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING