Merge "audiopolicy: Avoid spurious routing in APM::stopSource" into nyc-mr1-dev
am: 12c7be6230

Change-Id: Ia56876ff86d1c06842770ea94d068cfd7e6170b1