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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida9134e91546cfde62ec6667dbcb5dd1cdd0738d