Merge "Do not resolve port index for apps which are not target on T" into...

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

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



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