Merge "Use a separate hwcomposer hidl instance for vr flinger" into oc-mr1-dev-plus-aosp