Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed
am: 02bf433f90

* commit '02bf433f902aa34483aa2fc1b410f393b35058f1':
  Fix race condition when setting default ringtones