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

Change-Id: I74bfe5a3cabb844839e136fc4b9fc6e83610fba1