Tweak volume adjustment rules

Test: manual
Bug: 197586676
Bug: 202500642
Merged-In: If531a23f5e7b242d3d637966b74b67acfd303199
Change-Id: If531a23f5e7b242d3d637966b74b67acfd303199
(cherry picked from commit 022081595bf4a082f8354b852eae6d5a015be3fe)
Merged-In:If531a23f5e7b242d3d637966b74b67acfd303199
8 files changed