[automerger skipped] Merge "Merge "Do not start VrManagerService if VR is not...
[automerger skipped] Merge "Merge "Do not start VrManagerService if VR is not supported" into pi-dev am: 2667c1df" into pi-dev-plus-aosp
am: e9d38658 -s ours
Change-Id: I0d16bd975bf59d5da6d1eedc773a11cfb0dc77bd