[automerger skipped] Tweak volume adjustment rules am: 02208159 am:...

[automerger skipped] Tweak volume adjustment rules am: 02208159 am: 904dd271 -s ours am: 1c6275b1 -s ours

am skip reason: Merged-In If531a23f5e7b242d3d637966b74b67acfd303199 with SHA-1 aa9dc925 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16220980

Change-Id: Iebf3b711d7bb8205527edcd17eee5b78f91ed06c