DO NOT MERGE SF: Add property to disable HWC virtual displays am: 3cf4bfe236 am: cce24b398c
am: a807cd502e  -s ours

Change-Id: I6db7acde91a8d884efda3d590468e009602479ee