Merge "Call MediaStore#scanFile directly in RingtoneManager" into qt-dev am: 8197beee18
am: aad720ee11

Change-Id: I5bb7e2600994c4a7583f29a2804710cb0833361a