Merge "surfaceflinger: fix a nullptr dereference" into oc-dev am: 29e5fa3fda
am: cefb8a6742

Change-Id: I6d3e51289f6a7c435523a8cb9bc6ccc677923fae