Merge "VR: Remove HIDL VR Composer from service/vr/vr_window_manager" into oc-dev