Merge "audio policy service: fix audioserver port cb upon APS crash" into pi-dev