Merge "healthd: Support new PD and USB Type C types"