Merge "Keep standalone devices in VrFlinger mode." into oc-mr1-dev am: 4b58ec8645  -s ours
am: be4410cdeb

Change-Id: If2106e14d88af9e5778109fa2acaa66eea01f221