Merge "Fix deadlock when transitioning to vr flinger" into oc-mr1-dev
am: c026c52ee6

Change-Id: I1703d835bba529afdc4c7b9d6b8a3c195b1686df