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

Change-Id: I2976ce23d74de6cdaa2285c39d13d2a80e5eaf7a