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