Merge "AudioAttributes notification deprecation: fix javadoc order"