Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev am: e41a6c8b19 am: 2363da89a4
am: 5cb336586e  -s ours

* commit '5cb336586e55e6add5aec1d87ee8848657d9051d':
  Fix race condition when setting default ringtones