Merge "VR: Rename HIDL service name from vr_hwcomposer to vr"