[automerger skipped] Merge "Replace deduceRestrictedCapability with the...

[automerger skipped] Merge "Replace deduceRestrictedCapability with the version in libs/net" am: 544f5d44 am: c5bac2b8 am: fddc0b08 -s ours am: ab1c87d9 -s ours

am skip reason: skip tag Change-Id I83cd60b5405311bc33c4368316f7a65144709d0d with SHA-1 e39e9af5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1646910

Change-Id: Ic3fcad1d0b0cc90d01dbca37c8445924e92297cc