Merge "SF: handle long waiting Layer sync point" am: ff2623a3d5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice63faf3ecec4687ed1b4a55b08b6322a4001a74