Merge "sdm: fix GetFirstDisplayInterfaceType to report primary type"