Merge "Revert "Get rid of charging sounds toggle"" into pi-dev
am: 8e55299f98

Change-Id: I58e93b9c70d57224c01bd62fa47640badd1febaf