am 4ccc4f69: am 767790f6: Merge "Fix NPE if phone ringtone is set to None" into lmp-mr1-dev

* commit '4ccc4f6937b04fe345242a641e64e85a313fc200':
  Fix NPE if phone ringtone is set to None