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: 03ddc5c4 am: 0a773a81 am: 79a4bacb

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

Change-Id: I7952d998952dda80d8d155673e0bb860d7af588d