Tweak volume adjustment rules

Test: manual
Bug: 197586676
Bug: 202500642
Change-Id: If531a23f5e7b242d3d637966b74b67acfd303199
8 files changed