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

Change-Id: I1446e77d0836b1d5fb991c9da5d9e31054d14ba0