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

Change-Id: I43369e455c35a9e8dc3af9e163a958ef24c9dd46