Merge "Do not use isAudioOn hidden API" am: d322773f5a
am: c1e3f4f619

Change-Id: Ie4f38577060a896be3ac2295237ab71b2b6b753f