Merge "Merge "Only prevent overlapping SSG if a buffer is going to be synced"...

Merge "Merge "Only prevent overlapping SSG if a buffer is going to be synced" into udc-dev am: 2fa848da am: 2514c33a" into udc-d1-dev-plus-aosp am: 154545f4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23085297



Change-Id: I9e482765ccd1378b90a949c1b57186e6e4d007ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>