Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev
am: 849302c0f1

Change-Id: I5eea2d35eec58ada02756f060374d2940198cbe1