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

Change-Id: I33ea74845cb55771f568276364e0ed95b156bb7f