Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev
am: 0d8c4765b2

Change-Id: I709b8c9f3d6d32f3f71c2848716563a6b598d503