[automerger skipped] [automerger] sonivox: prevent infinite loop in OTA ringtones am: 3cc5df8211 am: f2ff304d3d am: d197336240 am: 48a01ea702 am: d4b2d8ee49 am: c70b457b33 am: 1692dbe3d6
am: 3f4cac4bff  -s ours

Change-Id: Id21cd1ed0d82dc5fa78bc1837704ca3b51254e6d