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

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