Merge "allow system server to read extcon state and type from sysfs"