Merge "Don't request sync again for reparented WC" into tm-dev am: 7b0ceb4f am: 56a35d96 am: 3721ec1f am: bb63480a

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



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