Merge "Merge "Do not start VrManagerService if VR is not supported" into pi-dev am: 2667c1df" into pi-dev-plus-aosp