Merge "Compare ringtones using IDs." into qt-dev am: 8be2c7def9 am: 3479d6d783
am: 6f407abd08

Change-Id: I3a2f520ffcc2208dc9f49f87beb0ce55469a7e0b