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

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

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



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