Merge commit 'cb32359081c08d147bdb0569de21ceed59b57fc9' * commit 'cb32359081c08d147bdb0569de21ceed59b57fc9': Fix bug 2146274. Modify the Audio Policy Manager