am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media...

am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d

Merge commit '9d14e3ea' into kraken

* commit '9d14e3ea':
  When updating existing entries in the media database, don't update