Merge "Prevent updating invlid child task surfaces in the sync queue" into...

Merge "Prevent updating invlid child task surfaces in the sync queue" into tm-qpr-dev am: 3d8e5f7e am: a5f2118f

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



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