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