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

Change-Id: I35b60c869a8f31ea9f70905f4ad3f9f1a44f0811