Merge "Don't clear sync information if WS is waiting on child windows" into...

Merge "Don't clear sync information if WS is waiting on child windows" into rvc-dev am: 7ecb0d03 am: 5548b073 am: 5e3daf75 am: 452e3791

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

Change-Id: I430df6c47557d10aa6453c13a786b485ff896b5c