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

Change-Id: I76eb570e1c08ee57d931221169b503033e466d49