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

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

Change-Id: Ia79233bbfa06b5354dec4003be6c81a79865fc12