Merge "DO NOT MERGE - Small documentation fix for AudioManager.java" into jb-mr2-dev