Merge "Revert "Replace hidden AudioManager.FLAG_FROM_KEY usage""