Merge "healthd: Support new PD and USB Type C types" am: ab75edb4ad
am: 741df1263e

* commit '741df1263e2903cba9ebbb333d01654107401378':
  healthd: Support new PD and USB Type C types