[automerger skipped] SurfaceFlinger: clear LayerHistory on touch
am: 7e49aa4ceb -s ours
am skip reason: change_id Ifa095fbcdb95ffe413cc77c5e062f1174815158b with SHA1 a9bf4cadf7 is in history

Change-Id: I89c08149702ca53804a34e0a3b73576350f934cd