Merge "Fix concurrent access bug in VrFlinger." into oc-dr1-dev am: d90e5399a4
am: 4a20620e2b

Change-Id: I235b954716ed8f73d22391977b7ea6718f06a028