Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
am: e63965cef5

Change-Id: If1e6876fa6466fa047213f6f1ebbb42d004486f0