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

media/java/android/media/tv/TvInputHardwareInfo.java

@@ -190,13 +190,16 @@ public final class TvInputHardwareInfo implements Parcelable {
 
     /** @hide */
     public Builder toBuilder() {
-        return new Builder()
+        Builder newBuilder = new Builder()
             .deviceId(mDeviceId)
             .type(mType)
             .audioType(mAudioType)
             .audioAddress(mAudioAddress)
-            .hdmiPortId(mHdmiPortId)
             .cableConnectionStatus(mCableConnectionStatus);
+        if (mType == TV_INPUT_TYPE_HDMI) {
+            newBuilder.hdmiPortId(mHdmiPortId);
+        }
+        return newBuilder;
     }
 
     public static final class Builder {