HWC2: Fix virtual displays am: 5450fe5268 am: d6fb6ea07b am: aa23ebe03e  -s ours
am: 327490c8c8

Change-Id: I5a370186699fd7b800b3892d9a47f41e0447669c