Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am: 2792ff4527
am: 83f8bba2a5

Change-Id: Ie5a2b0f7cc37092618a7d35083cf53bf9f7f4212