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

Change-Id: Ib83b3a1c52977ddda229d3fdf3b55af973a243e1