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

Change-Id: I44b1a8914aa3b66b187e3fb80f493ccc2605e785