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

Change-Id: Id4ac4fcfad2d5a786344a1227917370823a9460b