Merge "Do not resolve port index for apps not targeting SDK T and beyond" into...

Merge "Do not resolve port index for apps not targeting SDK T and beyond" into tm-dev am: 523145c4

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



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