sf: Align virtual display changes with CAF

* These changes are part of CAF AOSP merge commits

Change-Id: I390f874347d259fca4429c19711be6c85b104090
2 files changed