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

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

Change-Id: I14c214fd773cd9c079d3ebd6f0fc7d4c04b5177b