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

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

Change-Id: I9eeb69ad76e22cc38aac7da7c67e6ec9625d709b