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

* commit '767790f68087c2f4b5a351cfe76276e83c498555':
  Fix NPE if phone ringtone is set to None