Merge "surfaceflinger: fix a nullptr dereference" into oc-dev am: 29e5fa3fda am: 773c9b7be9 am: 6f6b9fec67
am: a188c2b5c5

Change-Id: I05caae35ecd2d95f36789482ac3e174224472ba9