am b955a66e: Merge "Add VoicemailRingtonePreference to contain lookup logic." into lmp-mr1-dev automerge: 4b94a31

* commit 'b955a66e40cdc01332dcc7e74c962ee764bd8468':
  Add VoicemailRingtonePreference to contain lookup logic.