Merge "Merge "Correct portIdToPath for TV" into main am: 75a671c7 am:...

Merge "Merge "Correct portIdToPath for TV" into main am: 75a671c7 am: ab38b73b" into udc-qpr-dev-plus-aosp am: 3266caaa

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



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