(Cherry-picked from 353ef62780) Bug: 144872669 Test: Build, manually play around with volume settings Change-Id: Ia5589689e5c37be3898ac1edb2df00b84280cb7d Merged-In: Ia5589689e5c37be3898ac1edb2df00b84280cb7d
353ef62780
458a9a2561
ede31cad1c