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: Ibc80d912149b1c899587d6d59e6dca072d2492d4