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