am 2523a601: Merge "Remove all ringtones except default on Xoom Bug: 5032006"

* commit '2523a6016a9a3d5626e041aa742e982870aecd5d':
  Remove all ringtones except default on Xoom Bug: 5032006