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

Change-Id: If244b848adee0b3c8f8c23196f96dc3024d25170