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

Change-Id: I72c0ca4d6dff8e295eaeddc472cb3b3cc49b4498