Merge "Don't set hdmiPortId for non HDMI device." am: 9923250234

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36cad560a43862c38c3b2749876a7a6fe436c9ad