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

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

Change-Id: I799232d0a9bbca832d2114d096c30e3c90cda7b5