Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev