Merge "Strengthen dataspace guarantees in SurfaceFlinger." into udc-dev am: 2493d122 am: e8c78b7c

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



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