[automerger skipped] Tweak volume adjustment rules am: 022081595b am: 904dd271b9 -s ours

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

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

Change-Id: I345f1d230b15b5a656af33c461380e09b86422b1