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

Change-Id: I4998198711eaa4e951e37d5eb6bbebe0a065621d