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

Change-Id: I7b57a6112bb54d53a4f158e1a567ddec7fb49e8f