[automerger skipped] DO NOT MERGE: SF: fix SurfaceFlinger freeze am: 3ca95a0e08 am: 8724749abf -s ours
am skip reason: subject contains skip directive

Change-Id: I37fc3c0e5d9856e598a4194e3afb2e18588523fc