Fix unexpected VR mode exit on package update. am: 1ad4a2d32e
am: 4e61a045e1

Change-Id: Ib5b02c1d27da030cf9f8e75328507b791d934cef