Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev