surfaceflinger: fix a nullptr dereference am: 0a68b461d3
am: b111e153d9

Change-Id: I31ce55db7b94082405d54b730f98c7875c1c85e5