Merge "Don't send volume keys twice" into rvc-dev am: 83cdf386 am: 7bfd5d5f am: 93ac1a6e

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

Change-Id: I2224516018202b0f3251a6a8a2f5ba8b0d5dee94