Merge "Add SystemApi to AudioManager method"