[automerger skipped] Merge "Merge "Fix volume key handling for key press...

[automerger skipped] Merge "Merge "Fix volume key handling for key press repeat" into rvc-dev am: 59b3f7c7 am: 59d99176" into rvc-d1-dev-plus-aosp am: 53bad9ac -s ours

am skip reason: Change-Id I7a75af651b6b424129515a8991b5afb15c62dba3 with SHA-1 7c701607 is in history

Change-Id: I795e521febaedc98671d19e767b3a75cc79133f7