Merge "Use a separate hwcomposer hidl instance for vr flinger" into oc-mr1-dev am: 27a7c02f0c  -s ours
am: 991f7c6393  -s ours

Change-Id: I116ef04e2d6830b6099a8430b9d98d6889fdfe85