Merge "Revert "All users will hear charging sounds."" into pi-dev am: 5b66df1a36
am: 7f238a1203

Change-Id: I1f6d2cdf987a7ce88914ac40d2552decb76d2623