Merge "[SurfaceFlinger] Checking nullptr for HWC layer." am: 7038766ba1
am: 1560941b5e

Change-Id: I4c410239c9f8734fea33cb5adb7777cc316f4d55