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

Change-Id: Ic6bf1e1ca920477ce3237f6273987778bf884d93