Merge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev am: 3661a6f91b
am: 7efe982f0f  -s ours

Change-Id: I1f14832ea52f8ebeb9982dfb1a1669b32c8a208e