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

* commit '02f9837ea7eb92b85809218815c06d39e2bcbef0':
  DO NOT MERGE Fix wrong voice mail ringtone for secondary SIM.

Change-Id: Ib9dcd05e4f208cac6fa6a5b33b1857be5bc33a69