Merge "DO NOT MERGE SF: Add property to disable HWC virtual displays" into nyc-mr1-dev am: e26ce9f612 am: c65a0ebf68
am: f2cf7164f8  -s ours

Change-Id: Ic2006e408927037f2bce2fc799993ad939b16991