[automerger skipped] Merge "[SurfaceFlinger] Checking nullptr for HWC layer." am: 7038766ba1 am: 1560941b5e
am: 8acaef00f6  -s ours

Change-Id: I4255a87fd3b198cae40dbd4ca00c6e6633ca6cbb