Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001
am: 4f22c781b6

* commit '4f22c781b614322fe3790d314a527ac10471a63a':
  Revert "Fix race condition when setting default ringtones"