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

Change-Id: I4ec363574cac5b2f5213678cf3c18f8fd246367a