Merge "Refines volume key shortcut confirm dialog strings" into rvc-dev am: 084b2de5 am: 6a7ce20a am: ef332ca7 Change-Id: I72b5c4b7055bc44d8ac312e163dca1db721434c1