Merge "Add keyguard state as a gate for VR Mode." into oc-mr1-dev
am: 3f58b239a2

Change-Id: I6ce4e162a32c89c3dc12cc2d4efcd4186e0fe402