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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie11f0ec4204d6c4987f32a9b18e8d632c8448f84