[automerger skipped] Tweak volume adjustment rules am: 022081595b am: 904dd271b9 am: ee9ff19392 -s ours am: 8b94a8b3d2 -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: Ic0493fb6bca564ffae2734fc727b1cf74ee0ac84
This commit is contained in: