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

* commit 'b67ae42ad07ed6a5b4927c41089076e6eafd6949':
  Fix race condition when setting default ringtones