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

Change-Id: Iba1657c1cb907fa6f57e05a2ab8054fe45b7e7a0