Merge "Merge "Don't send volume keys twice" into rvc-dev am: 83cdf386 am:...

Merge "Merge "Don't send volume keys twice" into rvc-dev am: 83cdf386 am: 531c5361 am: 48162d3d" into rvc-qpr-dev-plus-aosp am: 8edfbf18

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

Change-Id: Ibe03d599619909641c76a29ad120391d1ff19dc1