Merge "Refactor VR state management in ActivityManagerService." into oc-dev
am: e002ce70e3

Change-Id: Id619a22930c52ac82c8526c2a215ee6499320720