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

Change-Id: I91c890583b6a1d40d7df8cb7f00911ee67012ab2