am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the...

am ea37d9b4: am aaa01b18: Merge "    Fix bug 2670395 and 2599698     When the user selects a "Silent" notification sound, the Uri encoded     path is an empty string. Setting this Uri as the data source of the     MediaPlayer used to play notifications caused the comp

Merge commit 'ea37d9b4' into kraken

* commit 'ea37d9b4':
  Fix bug 2670395 and 2599698