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

Change-Id: I41c6869f6514496a5dfc615ef7763f06b6fe1dbd