Merge \\"HWC2On1Adapter: populateCapabilities: fix virtual display query\\" into nyc-mr1-dev am: 91476a0c20
am: abb745c556

Change-Id: I0f22a1e84655b79319d9e480b3dc1a951ab43e1d