[automerger skipped] SurfaceFlinger: Dispsync changePhaseOffset
am: 43c88661a3 -s ours
am skip reason: change_id I436c63914e53ddb53963c590493ee160efb62db8 with SHA1 2242f72398 is in history

Change-Id: I8bdf366838a2e672ed00ad1fa4d65ba128a4d509