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

Change-Id: Ic1806500ba732a756ea1f95b0fc023b544c39ecc