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

Change-Id: I4fc1d829b5b3f69fecacabdb401f2058e8bfdef1