Merge "Don't clear sync information if WS is waiting on child windows" into rvc-dev am: 7ecb0d03 am: 03ddc5c4

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

Change-Id: I4008cc952397b2ec109a5b8ce14c03b0c9228f61