Merge "DO NOT MERGE Fix wrong voice mail ringtone for secondary SIM." into nyc-mr1-dev