Merge changes from topic "re-simplify-wcg"

* changes:
  surfaceflinger: simplify getActiveColorMode check
  surfaceflinger: simplify P3 support in RE
  surfaceflinger: fix WCG flag in DisplayDevice creation