[automerger skipped] Merge "Unblocking surface sync if the viewroot dies before traversal can happen" into tm-qpr-dev am: c9425a38 am: 39ab958f -s ours

am skip reason: Merged-In Ie168b7cb772f6ec89063a42a7b15e7d5342f5bd3 with SHA-1 2ff9d230 is already in history

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



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