Merge "Volume curves: alarm and accessibility can't be muted" into pi-dev
am: 93768b1382

Change-Id: I31cc96abdbf4d05e43073e268a60b9007e9650f7