2e804444d6
Bug: 10130785 uncanonicalize() can return a null now, so abort restoring the ringtone in that case. Change-Id: I28765818c8d3e1fb3f271afdfe66ebc955cfcefe