Merge "HWC2On1Adapter: populateCapabilities: fix virtual display query" into nyc-mr1-dev