Merge "Do not resolve port index for apps which are not target on T" into tm-dev am: dfe81b84

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



Change-Id: I926b0b25dfa9726cf3ef5e8b7916f0102ba4daf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>