Merge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev am: bbd01422d3
am: 211cd1bd3d

Change-Id: I383642287235cdda5cefd4962e24bb74cd7c3041