[automerger skipped] Merge "SF: handle long waiting Layer sync point" am: ff2623a3d5 am: 144c551dc8 am: 16080c0c6b -s ours

am skip reason: Change-Id I17f3751836574c3691c7e5a1e6d2ea6c3fcd3903 with SHA-1 948c642aaa is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1457858

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I634211fe7509ebd95b5d2537789d086c64f85179