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

Change-Id: I3c2b4b69c543a09414f68c608246da4a70c320c2