Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev
am: 4e1d67bd32

Change-Id: I951313d72530540077a777406754ab97a4566d72