Merge "Fix notifications for USB PD enabled devices" into nyc-dev am: 73722c4b0c
am: 59c27e95a1

* commit '59c27e95a1d7db4431e476d42c5f8e1e6090e0f7':

Change-Id: I94356193ceb727d145ffdbe45b619e0159722355