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: 7bfd5d5f am: 93ac1a6e" into rvc-qpr-dev-plus-aosp am: 4f295bcc

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

Change-Id: I08f99844ce58226748dd1744e802f7954683acf8