Merge changes Ia1fa4a32,I2a4c3d9f into oc-dev

* changes:
  hwc2: Remove Display::{mIsVirtual,setVirtual}
  hwc2: Cache display type at construction