Merge commit '9b5caf539136ccc1106b49155f531f5e70b41ba0' into eclair-plus-aosp * commit '9b5caf539136ccc1106b49155f531f5e70b41ba0': Fix bug 2146274. Modify the Audio Policy Manager