Merge "Merge "Correct portIdToPath for TV" into main am: 75a671c7fc am: ab38b73bdd" into udc-qpr-dev-plus-aosp