Merge "Remove dead setRingerMode(mode, mask)"