Merge "Don't request sync again for reparented WC" into tm-dev am: 7b0ceb4f...

Merge "Don't request sync again for reparented WC" into tm-dev am: 7b0ceb4f am: 7481dcbb am: 55d0efa9 am: 262db425

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



Change-Id: I6a1bd9fb880bd7e47a7e414451868facc0fc9a27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>