Merge "Issue 3315999: catch ToneGenerator exceptions." into honeycomb