Merge "Consume sync draw handlers if the surface is destroyed" into tm-dev am:...

Merge "Consume sync draw handlers if the surface is destroyed" into tm-dev am: d0f3d14f am: 5c65b011

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

Change-Id: I60314f583e7050c3c8de1c910b573b97ef6d5fa0