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

Change-Id: I6e37290b6ce21463139ee41b4e71a2f23477734e