Merge "Merge "Handle volume keys to apps in Vr mode" into oc-dev am: a58589bdc1" into oc-dev-plus-aosp