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

Change-Id: Ie55679325194224637fe9bb312bed3d6e6fc34d2