Merge "surfaceflinger: silence an error for non-WCG displays" am: 91fb454435 am: fbae725101
am: aa87867c70

Change-Id: I5f258cf949244ec85e01d5406a146e147899dd2c