Merge "Disables VR components by default, but enables them if a VR app is...
Merge "Disables VR components by default, but enables them if a VR app is installed." into nyc-dev am: de5dbec3
am: c9848d0a
* commit 'c9848d0a':
Disables VR components by default, but enables them if a VR app is installed.
Change-Id: I42c6e7f25db68509663cbb481f9c601a2c9b5312