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

Change-Id: I1181c859c5eb112cc316c7619bca0459df5f8eb8