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

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

Change-Id: I649c2b42926ed37c98106a32618e985e927bfc5b