Merge "Don't request sync again for reparented WC" into tm-dev am: 7b0ceb4f am: 7481dcbb am: cbf4687c am: c7fd3874

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



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