[automerger skipped] Merge "APM: Notify the client about new audio ports" am:...
[automerger skipped] Merge "APM: Notify the client about new audio ports" am: 272808c3 am: 0ec4c815 -s ours
am skip reason: Change-Id I3fede7f5a04419b15e15476d8b5ac7dc6d63c98d with SHA-1 d0e2c749 is in history
Change-Id: Ia1339b5c82e04051cec37b85ef9cd668ecf06cda