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

Change-Id: I8e886c9e8968b79253e782da4d9103505311cfa8