DO NOT MERGE: SF: fix SurfaceFlinger freeze am: 3ca95a0e08

Change-Id: I6f19ca36d1d1330ff2ed1430f941133aab4cda82