Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev
am: e41a6c8b19

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